diff --git a/db/zm_update-1.28.108.sql b/db/zm_update-1.28.108.sql
index b22fccaba..bbdcab32c 100644
--- a/db/zm_update-1.28.108.sql
+++ b/db/zm_update-1.28.108.sql
@@ -10,7 +10,7 @@ SET @s = (SELECT IF(
 	FROM INFORMATION_SCHEMA.STATISTICS
 	WHERE table_name = 'Frames'
 	AND table_schema = DATABASE()
-	AND index_name='EventId_idx';
+	AND index_name = 'EventId_idx'
 	) > 0,
 "SELECT 'EventId Index already exists on Frames table'",
 "CREATE INDEX `EventId_idx` ON `Frames` (`EventId`)"
diff --git a/distros/debian/apache.conf b/distros/debian/apache.conf
index 92a2b6414..965c67f86 100644
--- a/distros/debian/apache.conf
+++ b/distros/debian/apache.conf
@@ -1,6 +1,6 @@
-Alias /zm /usr/share/zoneminder
+Alias /zm /usr/share/zoneminder/www
 
-<Directory /usr/share/zoneminder>
+<Directory /usr/share/zoneminder/www>
   php_flag register_globals off
   Options Indexes FollowSymLinks
   <IfModule mod_dir.c>
diff --git a/distros/debian8/apache.conf b/distros/debian8/apache.conf
index 92a2b6414..965c67f86 100644
--- a/distros/debian8/apache.conf
+++ b/distros/debian8/apache.conf
@@ -1,6 +1,6 @@
-Alias /zm /usr/share/zoneminder
+Alias /zm /usr/share/zoneminder/www
 
-<Directory /usr/share/zoneminder>
+<Directory /usr/share/zoneminder/www>
   php_flag register_globals off
   Options Indexes FollowSymLinks
   <IfModule mod_dir.c>
diff --git a/distros/debian_cmake/apache.conf b/distros/debian_cmake/apache.conf
index 92a2b6414..965c67f86 100644
--- a/distros/debian_cmake/apache.conf
+++ b/distros/debian_cmake/apache.conf
@@ -1,6 +1,6 @@
-Alias /zm /usr/share/zoneminder
+Alias /zm /usr/share/zoneminder/www
 
-<Directory /usr/share/zoneminder>
+<Directory /usr/share/zoneminder/www>
   php_flag register_globals off
   Options Indexes FollowSymLinks
   <IfModule mod_dir.c>
diff --git a/distros/ubuntu1204/apache.conf b/distros/ubuntu1204/apache.conf
index 92a2b6414..965c67f86 100644
--- a/distros/ubuntu1204/apache.conf
+++ b/distros/ubuntu1204/apache.conf
@@ -1,6 +1,6 @@
-Alias /zm /usr/share/zoneminder
+Alias /zm /usr/share/zoneminder/www
 
-<Directory /usr/share/zoneminder>
+<Directory /usr/share/zoneminder/www>
   php_flag register_globals off
   Options Indexes FollowSymLinks
   <IfModule mod_dir.c>
diff --git a/distros/ubuntu1504/apache.conf b/distros/ubuntu1504/apache.conf
index 30a3774ac..965c67f86 100644
--- a/distros/ubuntu1504/apache.conf
+++ b/distros/ubuntu1504/apache.conf
@@ -1,6 +1,6 @@
 Alias /zm /usr/share/zoneminder/www
 
-<Directory /usr/share/zoneminder>
+<Directory /usr/share/zoneminder/www>
   php_flag register_globals off
   Options Indexes FollowSymLinks
   <IfModule mod_dir.c>
diff --git a/distros/ubuntu1504_cmake_split_packages/apache.conf b/distros/ubuntu1504_cmake_split_packages/apache.conf
index 92a2b6414..965c67f86 100644
--- a/distros/ubuntu1504_cmake_split_packages/apache.conf
+++ b/distros/ubuntu1504_cmake_split_packages/apache.conf
@@ -1,6 +1,6 @@
-Alias /zm /usr/share/zoneminder
+Alias /zm /usr/share/zoneminder/www
 
-<Directory /usr/share/zoneminder>
+<Directory /usr/share/zoneminder/www>
   php_flag register_globals off
   Options Indexes FollowSymLinks
   <IfModule mod_dir.c>
diff --git a/scripts/zmupdate.pl.in b/scripts/zmupdate.pl.in
index 6fbc7acd7..e9f4a2dc2 100644
--- a/scripts/zmupdate.pl.in
+++ b/scripts/zmupdate.pl.in
@@ -170,7 +170,7 @@ if ( $check && $Config{ZM_CHECK_FOR_UPDATES} )
             if ( $Config{ZM_UPDATE_CHECK_PROXY} ) {
 				$ua->proxy( "http", $Config{ZM_UPDATE_CHECK_PROXY} );
             }
-            my $req = HTTP::Request->new( GET=>'http://zoneminder.github.io/ZoneMinder/version.txt' );
+            my $req = HTTP::Request->new( GET=>'https://update.zoneminder.com/version.txt' );
             my $res = $ua->request($req);
 
             if ( $res->is_success )
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 9495cd683..e29717642 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -30,5 +30,6 @@ ENDFOREACH(CBINARY zma zmc zmf zmu zmstreamer)
 
 install(TARGETS zmc zma zmu zmf zmstreamer RUNTIME DESTINATION "${CMAKE_INSTALL_FULL_BINDIR}" PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
 install(TARGETS zms RUNTIME DESTINATION "${ZM_CGIDIR}" PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
-install(CODE "execute_process(COMMAND ln -sf zms nph-zms WORKING_DIRECTORY \"\$ENV{DESTDIR}${ZM_CGIDIR}\")")
+install(CODE "execute_process(COMMAND ln -sf zms nph-zms WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})" )
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/nph-zms DESTINATION "${ZM_CGIDIR}")