diff --git a/Frameworks/StepTalk/.cvsignore b/Frameworks/StepTalk/.cvsignore
new file mode 100644
index 0000000..862e5dc
--- /dev/null
+++ b/Frameworks/StepTalk/.cvsignore
@@ -0,0 +1,7 @@
+*.app
+*.debug
+*.profile
+shared_*obj
+*.bundle
+*.stmodule
+*.stlanguage
diff --git a/Tools/GNUmakefile b/Tools/GNUmakefile
index 22f302d..c97358f 100644
--- a/Tools/GNUmakefile
+++ b/Tools/GNUmakefile
@@ -42,9 +42,10 @@ stalk_OBJC_FILES = \
 stupdate_languages_OBJC_FILES =  \
         stupdate_languages.m
     
-ADDITIONAL_INCLUDE_DIRS += -I../Source/Headers
-ADDITIONAL_TOOL_LIBS += -lStepTalk
-ADDITIONAL_LIB_DIRS += -L../Source/$(GNUSTEP_OBJ_DIR)
+ADDITIONAL_TOOL_LIBS = -lStepTalk
+ADDITIONAL_INCLUDE_DIRS += -I../Frameworks/
+ADDITIONAL_LIB_DIRS += -L../Frameworks/StepTalk/StepTalk.framework/Versions/Current/$(GNUSTEP_TARGET_LDIR)
+
 ADDITIONAL_OBJCFLAGS = -Wall -Wno-import
 
 -include GNUmakefile.preamble