diff --git a/contrib/git_id/git_id.cpp b/contrib/git_id/git_id.cpp
index 7fda2d227..ee1f84a4b 100644
--- a/contrib/git_id/git_id.cpp
+++ b/contrib/git_id/git_id.cpp
@@ -610,8 +610,11 @@ bool generate_sql_makefile()
         sql_update_dir, sql_update_dir
     );
 
-    for(std::set<std::string>::iterator itr = file_list.begin(); itr != file_list.end(); ++itr)
-        fprintf(fout, "\t%s \\\n", itr->c_str());
+    for(std::set<std::string>::iterator itr = file_list.begin(), next; itr != file_list.end(); ++itr)
+    {
+        next = itr; ++next;
+        fprintf(fout, "\t%s %s\n", itr->c_str(), next == file_list.end() ? "" : "\\");
+    }
 
     fprintf(fout,
         "\n## Additional files to include when running 'make dist'\n"
@@ -619,8 +622,11 @@ bool generate_sql_makefile()
         "EXTRA_DIST = \\\n"
     );
 
-    for(std::set<std::string>::iterator itr = file_list.begin(); itr != file_list.end(); ++itr)
-        fprintf(fout, "\t%s \\\n", itr->c_str());
+    for(std::set<std::string>::iterator itr = file_list.begin(), next; itr != file_list.end(); ++itr)
+    {
+        next = itr; ++next;
+        fprintf(fout, "\t%s %s\n", itr->c_str(), next == file_list.end() ? "" : "\\");
+    }
 
     fclose(fout);
 
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index 760e62ee4..c60dc916b 100644
--- a/src/shared/revision_nr.h
+++ b/src/shared/revision_nr.h
@@ -1,4 +1,4 @@
 #ifndef __REVISION_NR_H__
 #define __REVISION_NR_H__
- #define REVISION_NR "7003"
+ #define REVISION_NR "7004"
 #endif // __REVISION_NR_H__