diff --git a/src/conf.c b/src/conf.c
index b726e4fe..1eddbd14 100644
--- a/src/conf.c
+++ b/src/conf.c
@@ -136,6 +136,7 @@ static CONF_ELEMENTS conf_elements[] = {
     { 0, 0, CONF_T_INT,"scanning","concat_compilations" },
     { 0, 0, CONF_T_INT,"scanning","case_sensitive" },
     { 0, 0, CONF_T_INT,"scanning","follow_symlinks" },
+    { 0, 0, CONF_T_INT,"scanning","skip_first" },
     { 0, 0, CONF_T_INT,"scan","correct_order" },
     { 0, 0, CONF_T_INT, NULL, NULL }
 };
diff --git a/src/main.c b/src/main.c
index 85d097f9..c6a950dd 100644
--- a/src/main.c
+++ b/src/main.c
@@ -518,7 +518,8 @@ int main(int argc, char *argv[]) {
     DPRINTF(E_LOG,L_MAIN,"Serving %d songs.  Startup complete in %d seconds\n",
             song_count,end_time-start_time);
 
-    if(conf_get_int("general","rescan_interval",0) && (!reload))
+    if(conf_get_int("general","rescan_interval",0) && (!reload) &&
+       (!conf_get_int("scanning","skip_first",0)))
         config.reload = 1; /* force a reload on start */
 
     while(!config.stop) {