diff --git a/src/Makefile.am b/src/Makefile.am
index 89c5597af..b73d321d7 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -18,7 +18,7 @@ zms_SOURCES = zms.cpp $(zm_SOURCES)
 zmu_SOURCES = zmu.cpp $(zm_SOURCES)
 zmfix_SOURCES = zmfix.cpp zm_debug.c zm_db.cpp zm.cpp
 
-noinst_HEADERS = zm.h zm_db.h zm_font.h zm_config.h zm_debug.h zm_coord.h zm_box.h zm_image.h zm_event.h zm_zone.h zm_camera.h zm_local_camera.h zm_remote_camera.h zm_monitor.h zm_font.h jinclude.h
+noinst_HEADERS = zm.h zm_db.h zm_font.h zm_rgb.h zm_config.h zm_debug.h zm_coord.h zm_box.h zm_image.h zm_event.h zm_zone.h zm_camera.h zm_local_camera.h zm_remote_camera.h zm_monitor.h zm_font.h jinclude.h
 
 EXTRA_DIST = zm_config.h.z
 
diff --git a/src/Makefile.in b/src/Makefile.in
index b71214c70..a61a55623 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -135,7 +135,7 @@ zms_SOURCES = zms.cpp $(zm_SOURCES)
 zmu_SOURCES = zmu.cpp $(zm_SOURCES)
 zmfix_SOURCES = zmfix.cpp zm_debug.c zm_db.cpp zm.cpp
 
-noinst_HEADERS = zm.h zm_db.h zm_font.h zm_config.h zm_debug.h zm_coord.h zm_box.h zm_image.h zm_event.h zm_zone.h zm_camera.h zm_local_camera.h zm_remote_camera.h zm_monitor.h zm_font.h jinclude.h
+noinst_HEADERS = zm.h zm_db.h zm_font.h zm_rgb.h zm_config.h zm_debug.h zm_coord.h zm_box.h zm_image.h zm_event.h zm_zone.h zm_camera.h zm_local_camera.h zm_remote_camera.h zm_monitor.h zm_font.h jinclude.h
 
 EXTRA_DIST = zm_config.h.z
 subdir = src
diff --git a/web/Makefile.am b/web/Makefile.am
index 72ddfbaa5..79d08e755 100644
--- a/web/Makefile.am
+++ b/web/Makefile.am
@@ -6,9 +6,9 @@ webdir = @WEB_PREFIX@
 webuser = @WEB_USER@
 webgroup = @WEB_GROUP@
 
-web_DATA = zmactions.php zmconfig.php zmdb.php zmfuncs.php zmhtml.php zm.php zmstyles.css zmwml.php
+web_DATA = zm_actions.php zm_config.php zm_db.php zm_funcs.php zm_html.php zm.php zm_styles.css zm_wml.php
 
-EXTRA_DIST = zmconfig.php.z zmactions.php zmdb.php zmfuncs.php zmhtml.php zm.php zmstyles.css zmwml.php swap.pl retag.sh
+EXTRA_DIST = zm_config.php.z zm_actions.php zm_db.php zm_funcs.php zm_html.php zm.php zm_styles.css zm_wml.php swap.pl retag.sh
 
 # Yes, you are correct. This is a HACK!
 install-data-local:
diff --git a/zmconfig.pl.in b/zmconfig.pl.in
index fd5ce7021..e579b839d 100755
--- a/zmconfig.pl.in
+++ b/zmconfig.pl.in
@@ -956,7 +956,7 @@ sub breaktext
 
 if ( $reprocess )
 {
-	my @config_files = qw( src/zm_config.h web/zmconfig.php scripts/zmdc.pl scripts/zmwatch.pl scripts/zmaudit.pl scripts/zmfilter.pl scripts/zmx10.pl scripts/zmpkg.pl scripts/zm db/zmschema.sql );
+	my @config_files = qw( src/zm_config.h web/zm_config.php scripts/zmdc.pl scripts/zmwatch.pl scripts/zmaudit.pl scripts/zmfilter.pl scripts/zmx10.pl scripts/zmpkg.pl scripts/zm db/zmschema.sql );
 
 	foreach my $config_file ( @config_files )
 	{