diff --git a/reactos/base/applications/applications.rbuild b/reactos/base/applications/applications.rbuild
index ba2e8ebc773..1573732d95a 100644
--- a/reactos/base/applications/applications.rbuild
+++ b/reactos/base/applications/applications.rbuild
@@ -26,9 +26,9 @@
 		<xi:include href="hh/hh.rbuild" />
 	</directory>
 <!--
-        <directory name="iexplore">
-                <xi:include href="iexplore/iexplore.rbuild" />
-        </directory>
+	<directory name="iexplore">
+		<xi:include href="iexplore/iexplore.rbuild" />
+	</directory>
 -->
 	<directory name="kbswitch">
 		<xi:include href="kbswitch/kbswitch.rbuild" />
@@ -54,6 +54,9 @@
 	<directory name="regedit">
 		<xi:include href="regedit/regedit.rbuild" />
 	</directory>
+	<directory name="regedt32">
+		<xi:include href="regedt32/regedt32.rbuild" />
+	</directory>
 	<directory name="sc">
 		<xi:include href="sc/sc.rbuild" />
 	</directory>
diff --git a/reactos/base/applications/regedt32/regedt32.c b/reactos/base/applications/regedt32/regedt32.c
new file mode 100644
index 00000000000..ba8222a3e73
--- /dev/null
+++ b/reactos/base/applications/regedt32/regedt32.c
@@ -0,0 +1,11 @@
+#include <windows.h>
+#include <tchar.h>
+#include <shellapi.h>
+
+int WINAPI _tWinMain(HINSTANCE hCurInst, HINSTANCE hPrevInst,
+                     LPTSTR lpsCmdLine, int nCmdShow)
+{
+    ShellExecute(NULL, NULL, _T("regedit.exe"), lpsCmdLine, NULL, nCmdShow);
+
+    return 0;
+}
diff --git a/reactos/base/applications/regedt32/regedt32.rbuild b/reactos/base/applications/regedt32/regedt32.rbuild
new file mode 100644
index 00000000000..c573dbeb1f0
--- /dev/null
+++ b/reactos/base/applications/regedt32/regedt32.rbuild
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
+<module name="regedt32" type="win32gui" installbase="system32" installname="regedt32.exe" unicode="yes">
+	<include base="regedt32">.</include>
+	<library>kernel32</library>
+	<library>shell32</library>
+	<file>regedt32.c</file>
+	<file>resource.rc</file>
+</module>
diff --git a/reactos/base/applications/regedt32/res/regedt32.ico b/reactos/base/applications/regedt32/res/regedt32.ico
new file mode 100644
index 00000000000..3ea82fa70be
Binary files /dev/null and b/reactos/base/applications/regedt32/res/regedt32.ico differ
diff --git a/reactos/base/applications/regedt32/resource.h b/reactos/base/applications/regedt32/resource.h
new file mode 100644
index 00000000000..88ba42f6b42
--- /dev/null
+++ b/reactos/base/applications/regedt32/resource.h
@@ -0,0 +1 @@
+#define IDI_REGEDIT     101
diff --git a/reactos/base/applications/regedt32/resource.rc b/reactos/base/applications/regedt32/resource.rc
new file mode 100644
index 00000000000..7eee0d5f444
--- /dev/null
+++ b/reactos/base/applications/regedt32/resource.rc
@@ -0,0 +1,33 @@
+/*
+ * Regedit-32 resources
+ *
+ * Copyright 2008 Carlo Bramini
+ *
+ * This program 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 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include <windows.h>
+#include "resource.h"
+
+// Common resources
+
+LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
+
+#define REACTOS_STR_FILE_DESCRIPTION	"ReactOS Registry Explorer\0"
+#define REACTOS_STR_INTERNAL_NAME	"regedt32\0"
+#define REACTOS_STR_ORIGINAL_FILENAME	"regedt32.exe\0"
+#include <reactos/version.rc>
+
+IDI_REGEDIT  ICON   DISCARDABLE   res/regedt32.ico