diff --git a/contrib/mysql_to_pgsql/cmake/FindMySQL.cmake b/contrib/mysql_to_pgsql/cmake/FindMySQL.cmake
index 3d13c6f4d..98b2f8a57 100644
--- a/contrib/mysql_to_pgsql/cmake/FindMySQL.cmake
+++ b/contrib/mysql_to_pgsql/cmake/FindMySQL.cmake
@@ -12,11 +12,8 @@ IF (MYSQL_INCLUDE_DIR)
 ENDIF (MYSQL_INCLUDE_DIR)
 
 FIND_PATH(MYSQL_INCLUDE_DIR mysql.h
-  "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 6.0;Location]/include"
-  "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.1;Location]/include"
-  "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.0;Location]/include"
-  "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 4.1;Location]/include"
-  "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 4.0;Location]/include"
+  $ENV{ProgramFiles}/MySQL/*/include
+  $ENV{SystemDrive}/MySQL/*/include
   /usr/local/mysql/include
   /usr/local/include/mysql
   /usr/local/include
@@ -31,11 +28,8 @@ ELSE(MSVC)
   SET(MYSQL_NAMES mysqlclient mysqlclient_r)
 ENDIF(MSVC)
 SET(MYSQL_SEARCH_LIB_PATHS
-  "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 6.0;Location]/lib/opt"
-  "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.1;Location]/lib/opt"
-  "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.0;Location]/lib/opt"
-  "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 4.1;Location]/lib/opt"
-  "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 4.0;Location]/lib/opt"
+  $ENV{ProgramFiles}/MySQL/*/lib/opt
+  $ENV{SystemDrive}/MySQL/*/lib/opt
   /usr/local/mysql/lib
   /usr/local/lib/mysql
   /usr/local/lib
diff --git a/contrib/mysql_to_pgsql/cmake/FindPostgreSQL.cmake b/contrib/mysql_to_pgsql/cmake/FindPostgreSQL.cmake
index 6cfabd2a2..2b37d57b4 100644
--- a/contrib/mysql_to_pgsql/cmake/FindPostgreSQL.cmake
+++ b/contrib/mysql_to_pgsql/cmake/FindPostgreSQL.cmake
@@ -11,24 +11,9 @@ IF (PGSQL_INCLUDE_DIR)
   SET(PostgreSQL_FIND_QUIETLY TRUE)
 ENDIF (PGSQL_INCLUDE_DIR)
 
-# the registry settings checked are in order:
-# - for pgInstaller 8.2.x postgresql version
-# - for pgInstaller 8.3.x postgresql version
-SET(PGSQL_WIN_BASE
- "[HKEY_LOCAL_MACHINE\\SOFTWARE\\PostgreSQL\\Installations\\{B823632F-3B72-4514-8861-B961CE263224};Base Directory]"
- "[HKEY_LOCAL_MACHINE\\SOFTWARE\\PostgreSQL\\Installations\\{1F701DBD-1660-4108-B10A-FB435EA63BF0};Base Directory]")
-
-IF(PGSQL_WIN_BASE)
-  IF(MSVC)
-    SET(PGSQL_SEARCH_LIB_PATHS "${PGSQL_WIN_BASE}/lib/ms")
-  ELSE(MSVC)
-    SET(PGSQL_SEARCH_LIB_PATHS "${PGSQL_WIN_BASE}/lib")
-  ENDIF(MSVC)
-ENDIF(PGSQL_WIN_BASE)
-
 FIND_PATH(PGSQL_INCLUDE_DIR libpq-fe.h
-  "[HKEY_LOCAL_MACHINE\\SOFTWARE\\PostgreSQL\\Installations\\{1F701DBD-1660-4108-B10A-FB435EA63BF0};Base Directory]/include"
-  "[HKEY_LOCAL_MACHINE\\SOFTWARE\\PostgreSQL\\Installations\\{B823632F-3B72-4514-8861-B961CE263224};Base Directory]/include"
+  $ENV{ProgramFiles}/PostgreSQL/*/include
+  $ENV{SystemDrive}/PostgreSQL/*/include
   /usr/local/pgsql/include
   /usr/local/postgresql/include
   /usr/local/include/pgsql
@@ -44,8 +29,8 @@ FIND_PATH(PGSQL_INCLUDE_DIR libpq-fe.h
 SET(PGSQL_NAMES pq libpq)
 SET(PGSQL_SEARCH_LIB_PATHS
   ${PGSQL_SEARCH_LIB_PATHS}
-  "[HKEY_LOCAL_MACHINE\\SOFTWARE\\PostgreSQL\\Installations\\{1F701DBD-1660-4108-B10A-FB435EA63BF0};Base Directory]/lib"
-  "[HKEY_LOCAL_MACHINE\\SOFTWARE\\PostgreSQL\\Installations\\{B823632F-3B72-4514-8861-B961CE263224};Base Directory]/lib"
+  $ENV{ProgramFiles}/PostgreSQL/*/lib
+  $ENV{SystemDrive}/PostgreSQL/*/lib
   /usr/local/pgsql/lib
   /usr/local/lib
   /usr/lib
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index 6532f046f..75b91171b 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 "9394"
+ #define REVISION_NR "9395"
 #endif // __REVISION_NR_H__