diff --git a/reactos/dll/win32/objsel/factory.c b/reactos/dll/win32/objsel/factory.c
index dafbfcd1bf1..f104c00045a 100644
--- a/reactos/dll/win32/objsel/factory.c
+++ b/reactos/dll/win32/objsel/factory.c
@@ -16,7 +16,7 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
 #include "objsel_private.h"
diff --git a/reactos/dll/win32/objsel/objsel.c b/reactos/dll/win32/objsel/objsel.c
index 490469c1211..8965bd09c64 100644
--- a/reactos/dll/win32/objsel/objsel.c
+++ b/reactos/dll/win32/objsel/objsel.c
@@ -15,7 +15,7 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
 #include "objsel_private.h"
diff --git a/reactos/dll/win32/objsel/objsel.rbuild b/reactos/dll/win32/objsel/objsel.rbuild
index 4df10a72242..74282493e24 100644
--- a/reactos/dll/win32/objsel/objsel.rbuild
+++ b/reactos/dll/win32/objsel/objsel.rbuild
@@ -1,19 +1,21 @@
-<module name="objsel" type="win32dll" baseaddress="${BASEADDRESS_OBJSEL}" installbase="system32" installname="objsel.dll">
+<module name="objsel" type="win32dll" baseaddress="${BASEADDRESS_OBJSEL}" installbase="system32" installname="objsel.dll" allowwarnings="true">
 	<autoregister infsection="OleControlDlls" type="DllRegisterServer" />
 	<importlibrary definition="objsel.spec.def" />
 	<include base="objsel">.</include>
 	<include base="ReactOS">include/reactos/wine</include>
-	<define name="UNICODE" />
-	<define name="_UNICODE" />
 	<define name="__REACTOS__" />
+	<define name="__WINESRC__" />
 	<define name="__USE_W32API" />
+	<define name="_WIN32_IE">0x600</define>
+	<define name="_WIN32_WINNT">0x501</define>
+	<define name="WINVER">0x501</define>
 	<library>wine</library>
-	<library>uuid</library>
-	<library>ntdll</library>
-	<library>kernel32</library>
-	<library>advapi32</library>
-	<library>user32</library>
 	<library>ole32</library>
+	<library>oleaut32</library>
+	<library>user32</library>
+	<library>advapi32</library>
+	<library>kernel32</library>
+	<library>uuid</library>
 	<library>ntdll</library>
 	<file>factory.c</file>
 	<file>objsel.c</file>
diff --git a/reactos/dll/win32/objsel/objsel.rc b/reactos/dll/win32/objsel/objsel.rc
index f85b45f72ec..304186809c8 100644
--- a/reactos/dll/win32/objsel/objsel.rc
+++ b/reactos/dll/win32/objsel/objsel.rc
@@ -15,7 +15,7 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
 #include "windef.h"
diff --git a/reactos/dll/win32/objsel/objsel_private.h b/reactos/dll/win32/objsel/objsel_private.h
index 68071dd45aa..a4fe00c53a4 100644
--- a/reactos/dll/win32/objsel/objsel_private.h
+++ b/reactos/dll/win32/objsel/objsel_private.h
@@ -15,7 +15,7 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
 #include <string.h>
diff --git a/reactos/dll/win32/objsel/objsel_ros.diff b/reactos/dll/win32/objsel/objsel_ros.diff
new file mode 100644
index 00000000000..de2161daf7d
--- /dev/null
+++ b/reactos/dll/win32/objsel/objsel_ros.diff
@@ -0,0 +1,10 @@
+Index: objsel.rbuild
+===================================================================
+--- objsel.rbuild	(revision 23122)
++++ objsel.rbuild	(working copy)
+@@ -1,4 +1,5 @@
+ <module name="objsel" type="win32dll" baseaddress="${BASEADDRESS_OBJSEL}" installbase="system32" installname="objsel.dll" allowwarnings="true">
++	<autoregister infsection="OleControlDlls" type="DllRegisterServer" />
+ 	<importlibrary definition="objsel.spec.def" />
+ 	<include base="objsel">.</include>
+ 	<include base="ReactOS">include/reactos/wine</include>
diff --git a/reactos/dll/win32/objsel/regsvr.c b/reactos/dll/win32/objsel/regsvr.c
index 2da0cc9075e..17c9fd3ec47 100644
--- a/reactos/dll/win32/objsel/regsvr.c
+++ b/reactos/dll/win32/objsel/regsvr.c
@@ -15,7 +15,7 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
 #include "config.h"
@@ -159,7 +159,7 @@ static HRESULT register_interfaces(struct regsvr_interface const *list) {
 	}
 
 	if (list->base_iid) {
-	    register_key_guid(iid_key, base_ifa_keyname, list->base_iid);
+	    res = register_key_guid(iid_key, base_ifa_keyname, list->base_iid);
 	    if (res != ERROR_SUCCESS) goto error_close_iid_key;
 	}
 
@@ -181,12 +181,12 @@ static HRESULT register_interfaces(struct regsvr_interface const *list) {
 	}
 
 	if (list->ps_clsid) {
-	    register_key_guid(iid_key, ps_clsid_keyname, list->ps_clsid);
+	    res = register_key_guid(iid_key, ps_clsid_keyname, list->ps_clsid);
 	    if (res != ERROR_SUCCESS) goto error_close_iid_key;
 	}
 
 	if (list->ps_clsid32) {
-	    register_key_guid(iid_key, ps_clsid32_keyname, list->ps_clsid32);
+	    res = register_key_guid(iid_key, ps_clsid32_keyname, list->ps_clsid32);
 	    if (res != ERROR_SUCCESS) goto error_close_iid_key;
 	}