diff --git a/Model/GNUmakefile b/Model/GNUmakefile
index dac82dbdc..48ef53e0d 100644
--- a/Model/GNUmakefile
+++ b/Model/GNUmakefile
@@ -32,7 +32,7 @@ include $(GNUSTEP_MAKEFILES)/common.make
 include ../Version
 LIBRARY_NAME = libgmodel
 
-ifeq ($(GUI_LIB), nx)
+ifeq ($(BUILD_NIB2GMODEL), yes)
 TOOL_NAME = nib2gmodel
 endif
 
diff --git a/Model/IBClasses.m b/Model/IBClasses.m
index 58cd9ae50..74b8c4ed7 100644
--- a/Model/IBClasses.m
+++ b/Model/IBClasses.m
@@ -54,6 +54,8 @@
 @end
 #endif
 
+#ifndef GNU_GUI_LIBRARY
+
 @implementation NSCustomObject (NibToGModel)
 - (id)awakeAfterUsingCoder:(NSCoder*)aDecoder
 {
@@ -91,7 +93,6 @@
 
 @end /* NSCustomObject */
 
-
 @implementation NSCustomView (NibToGModel)
 
 - (id)awakeAfterUsingCoder:(NSCoder*)aDecoder
@@ -254,3 +255,4 @@
 
 @end
 
+#endif