diff --git a/GNUmakefile b/GNUmakefile
index 8a2fcd5..03ad17f 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -43,7 +43,6 @@ GNUSTEP_LOCAL_ADDITIONAL_MAKEFILES=back.make
 include $(GNUSTEP_MAKEFILES)/common.make
 
 include ./Version
--include ../back/Version
 
 #
 # The list of subproject directories
diff --git a/Source/win32/GNUmakefile b/Source/win32/GNUmakefile
index 1bf77fb..3181783 100644
--- a/Source/win32/GNUmakefile
+++ b/Source/win32/GNUmakefile
@@ -33,8 +33,14 @@ include ../../config.make
 # The library to be compiled, as a library or as a bundle
 SUBPROJECT_NAME=win32
 
-#win32_SUBPROJECTS = MSUserNotifications
-SUBPROJECTS = MSUserNotifications
+# We NEED the base version so MSUserNotifications can compile correctly
+# We'll omit it if for some reason we couldn't get the Version file
+ifdef GNUSTEP_BASE_MAJOR_VERSION
+  ifdef GNUSTEP_BASE_MINOR_VERSION
+    #$(info building MSUserNotifications bundle...)
+    SUBPROJECTS = MSUserNotifications
+  endif
+endif
 
 win32_LOCALIZED_RESOURCE_FILES = \
 
diff --git a/Source/win32/MSUserNotifications/GNUmakefile b/Source/win32/MSUserNotifications/GNUmakefile
index afc5651..b267500 100644
--- a/Source/win32/MSUserNotifications/GNUmakefile
+++ b/Source/win32/MSUserNotifications/GNUmakefile
@@ -17,6 +17,9 @@ endif
 
 BUNDLE_NAME = NSUserNotification
 
+# Get common definitions - needed for base version information
+-include $(GNUSTEP_MAKEFILES)/common.make
+
 NSUserNotification_NEEDS_GUI = NO
 NSUserNotification_CFLAGS += -DWINVER=0x0600 -D_WIN32_IE=0x0600 -DBUILD_DLL -fms-extensions
 NSUserNotification_OBJCFLAGS += -DWINVER=0x0600 -D_WIN32_IE=0x0600 -DBUILD_DLL -fms-extensions
@@ -36,20 +39,21 @@ NSUserNotification_RESOURCE_FILES = \
 SUBPROJECTS = ToastNotifications TaskbarNotifications
 
 # Set this to the ROOT DIRECTORY of your GNUstep build that contains the 'core' directory...
-BASE_VERSION_DEFINED =
-ifneq ($(MAJOR_VERSION),)
-  ifneq ($(MINOR_VERSION),)
+ifdef GNUSTEP_BASE_MAJOR_VERSION
+  ifdef GNUSTEP_BASE_MINOR_VERSION
     BASE_VERSION_DEFINED=1
   endif
 endif
-ifdef ($(BASE_VERSION_DEFINED),)
+ifndef BASE_VERSION_DEFINED
   ifeq ($(GNUSTEP_BUILD_ROOT),)
     $(error You need to checkout core/base and/or set GNUSTEP_BUILD_ROOT to your gnustep root containing 'core/base' before compiling!)
   endif
   include ${GNUSTEP_BUILD_ROOT}/core/base/Version
+  GNUSTEP_BASE_MAJOR_VERSION=$(MAJOR_VERSION)
+  GNUSTEP_BASE_MAJOR_VERSION=$(MINOR_VERSION)
   BASE_VERSION_DEFINED=1
 endif
-libgnustep-base_INTERFACE_VERSION=$(MAJOR_VERSION).$(MINOR_VERSION)
+libgnustep-base_INTERFACE_VERSION=$(GNUSTEP_BASE_MAJOR_VERSION).$(GNUSTEP_BASE_MINOR_VERSION)
 NSUserNotification_INSTALL_DIR = $(GNUSTEP_LIBRARY)/Libraries/gnustep-base/Versions/$(libgnustep-base_INTERFACE_VERSION)/Resources/
 
 #include GNUmakefile.postamble