diff --git a/netutils/webserver/httpd-fsdata.h b/netutils/webserver/httpd-fsdata.h
index a7ff24b6c6..bc5a6659f1 100644
--- a/netutils/webserver/httpd-fsdata.h
+++ b/netutils/webserver/httpd-fsdata.h
@@ -46,6 +46,10 @@
 #include <sys/types.h>
 #include <net/uip/uip.h>
 
+/****************************************************************************
+ * Public Types
+ ****************************************************************************/
+
 struct httpd_fsdata_file
 {
   const struct httpd_fsdata_file *next;
@@ -59,7 +63,8 @@ struct httpd_fsdata_file
 #endif /* HTTPD_FS_STATISTICS */
 };
 
-struct httpd_fsdata_file_noconst {
+struct httpd_fsdata_file_noconst
+{
   struct httpd_fsdata_file *next;
   char *name;
   char *data;
diff --git a/netutils/webserver/httpd.c b/netutils/webserver/httpd.c
index 1f360c1abc..08ec2a2957 100644
--- a/netutils/webserver/httpd.c
+++ b/netutils/webserver/httpd.c
@@ -432,10 +432,10 @@ static inline int httpd_cmd(struct httpd_state *pstate)
   else
     {
       for (i = 0;
-           i < (HTTPD_MAX_FILENAME-1) && pstate->ht_buffer[i+5] != ISO_space;
+           i < (HTTPD_MAX_FILENAME-1) && pstate->ht_buffer[i+4] != ISO_space;
            i++)
         {
-          pstate->ht_filename[i] = pstate->ht_buffer[i+5];
+          pstate->ht_filename[i] = pstate->ht_buffer[i+4];
         }
         pstate->ht_filename[i]='\0';
     }