diff --git a/scripts/d_options.sh b/scripts/d_options.sh
index 57431ed9..d7760652 100755
--- a/scripts/d_options.sh
+++ b/scripts/d_options.sh
@@ -353,7 +353,11 @@ do
             [[ $M -gt 1 ]] && SFArguments+=','
             SFArguments+=$'\n'"  ${arg_type}$arg_name"
         else
-            SFArguments+="${arg_type}$arg_name"
+            if (( ${#SName} + ${#arg_type} + ${#arg_name} <= $max_width )); then
+                SFArguments+="${arg_type}$arg_name"
+            else
+                SFArguments+=$'\n'"  ${arg_type}$arg_name"
+            fi
         fi
         
         #[[ $M -gt 1 ]] && CLBody+=', \'$'\n'"    "
@@ -372,7 +376,7 @@ do
             StBody+="  /**"$'\n'
             format_doxy '   * ' "$(capitalise_first "$arg_descr")" || err_exit
             StBody+="$format_doxy_res"$'\n'"   */"$'\n'
-            StBody+="    ${arg_type}$nest_membr;"
+            StBody+="  ${arg_type}$nest_membr;"
         fi
     done
     
diff --git a/scripts/d_options_func.template b/scripts/d_options_func.template
index dc90c11a..e1580fd4 100644
--- a/scripts/d_options_func.template
+++ b/scripts/d_options_func.template
@@ -14,3 +14,4 @@ static MHD_INLINE struct MHD_DaemonOptionAndValue
   return opt_val;
 }
 
+