diff --git a/configure b/configure
index 09b5cb491acffdf438e078478910e62cce0172a4..59bcd7db077ae74cf5559cd079c8dee1aff1ce02 100755
--- a/configure
+++ b/configure
@@ -15228,6 +15228,7 @@ wine_fn_config_dll opengl32 enable_opengl32 implib
 wine_fn_config_test dlls/opengl32/tests opengl32_test
 wine_fn_config_dll pdh enable_pdh implib
 wine_fn_config_test dlls/pdh/tests pdh_test
+wine_fn_config_dll photometadatahandler enable_photometadatahandler
 wine_fn_config_dll pidgen enable_pidgen
 wine_fn_config_dll powrprof enable_powrprof implib
 wine_fn_config_dll printui enable_printui
diff --git a/configure.ac b/configure.ac
index 279339c0116d85e45b6096e1ef83eff2a380b1b2..5dc111c1746f9e0178260eb98b0043ca6e23e22a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2737,6 +2737,7 @@ WINE_CONFIG_DLL(opengl32,,[implib])
 WINE_CONFIG_TEST(dlls/opengl32/tests)
 WINE_CONFIG_DLL(pdh,,[implib])
 WINE_CONFIG_TEST(dlls/pdh/tests)
+WINE_CONFIG_DLL(photometadatahandler)
 WINE_CONFIG_DLL(pidgen)
 WINE_CONFIG_DLL(powrprof,,[implib])
 WINE_CONFIG_DLL(printui)
diff --git a/dlls/photometadatahandler/Makefile.in b/dlls/photometadatahandler/Makefile.in
new file mode 100644
index 0000000000000000000000000000000000000000..a4ce922ca608bb6ddc48510ea85df3cf84a08b55
--- /dev/null
+++ b/dlls/photometadatahandler/Makefile.in
@@ -0,0 +1,8 @@
+MODULE = photometadatahandler.dll
+
+C_SRCS = \
+	main.c
+
+RC_SRCS = photometadatahandler.rc
+
+@MAKE_DLL_RULES@
diff --git a/dlls/photometadatahandler/main.c b/dlls/photometadatahandler/main.c
new file mode 100644
index 0000000000000000000000000000000000000000..4de07a0f10e5c1517acf5de3f08fed23482fb766
--- /dev/null
+++ b/dlls/photometadatahandler/main.c
@@ -0,0 +1,43 @@
+/*
+ * PhotoMetadataHandler implementation
+ *
+ * Copyright 2012 Austin English
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#include "config.h"
+
+#include <stdarg.h>
+
+#include "windef.h"
+#include "winbase.h"
+#include "wine/debug.h"
+
+BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
+{
+    switch (fdwReason)
+    {
+        case DLL_WINE_PREATTACH:
+            return FALSE;    /* prefer native version */
+        case DLL_PROCESS_ATTACH:
+            DisableThreadLibraryCalls(hinstDLL);
+            break;
+        case DLL_PROCESS_DETACH:
+            break;
+    }
+
+    return TRUE;
+}
diff --git a/dlls/photometadatahandler/photometadatahandler.rc b/dlls/photometadatahandler/photometadatahandler.rc
new file mode 100644
index 0000000000000000000000000000000000000000..7178e4fc516f2765895b036cb6f361d2e4a1b3ab
--- /dev/null
+++ b/dlls/photometadatahandler/photometadatahandler.rc
@@ -0,0 +1,29 @@
+/*
+ * Resources for Photo Metadata Handler
+ *
+ * Copyright 2012 Austin English
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#define WINE_FILEDESCRIPTION_STR "Wine photometadatahandler dll"
+#define WINE_FILENAME_STR "photometadatahandler.dll"
+#define WINE_FILEVERSION 7,0,0,0
+#define WINE_FILEVERSION_STR "7.0.0.0"
+#define WINE_PRODUCTVERSION 7,0,0,0
+#define WINE_PRODUCTVERSION_STR "7.0.0.0"
+
+
+#include "wine/wine_common_ver.rc"
diff --git a/dlls/photometadatahandler/photometadatahandler.spec b/dlls/photometadatahandler/photometadatahandler.spec
new file mode 100644
index 0000000000000000000000000000000000000000..c5fc87af6d56deac17e8f4b4f16f92c6bfd59407
--- /dev/null
+++ b/dlls/photometadatahandler/photometadatahandler.spec
@@ -0,0 +1,4 @@
+@ stub DllCanUnloadNow
+@ stub DllGetClassObject
+@ stub DllRegisterServer
+@ stub DllUnregisterServer