diff --git a/ChangeLog b/ChangeLog
index e57d87ce..c4faa1c3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+1999-10-02  Lyndon Tremblay  <ltremblay@mezzanine.xnot.com>
+
+	* target.make: Links LIBNAME.so to LIBNAME_d.so, so you can build
+	applications without debug, but using the GNUstep debug libraries.
+	Needs to be added for other systems, I don't want to risk it, I don't
+	have any besides Linux ELF.
+	* rules.make: Added Java classpath, and working Java dependency per
+	Java package name; (org.gnu.gnustep.HiClass ->
+		GNUSTEP_SYSTEM_ROOT/Java/org/gnu/gnustep/HiClass.class, etc)
+	
 1999-10-01  Lyndon Tremblay  <ltremblay@mezzanine.xnot.com>
 
 	* openapp.in: Added working Java application support
diff --git a/rules.make b/rules.make
index 57a7f459..18ea946b 100644
--- a/rules.make
+++ b/rules.make
@@ -131,7 +131,8 @@ ALL_CFLAGS = $(INTERNAL_CFLAGS) $(ADDITIONAL_CFLAGS) \
    -I$(GNUSTEP_SYSTEM_HEADERS)
 
 ALL_JAVAFLAGS = $(INTERNAL_JAVAFLAGS) $(ADDITIONAL_JAVAFLAGS) \
-	$(AUXILIARY_JAVAFLAGS)
+	$(AUXILIARY_JAVAFLAGS) -classpath \
+	$(GNUSTEP_SYSTEM_ROOT)/Java/:$(GNUSTEP_USER_ROOT)/Java/:$(GNUSTEP_LOCAL_ROOT)/Java:$(GNUSTEP_NETWORK_ROOT)/Java:${CLASSPATH}:.
 
 ALL_LDFLAGS = $(ADDITIONAL_LDFLAGS) $(AUXILIARY_LDFLAGS) $(GUI_LDFLAGS) \
    $(BACKEND_LDFLAGS) $(SYSTEM_LDFLAGS) $(INTERNAL_LDFLAGS)
diff --git a/target.make b/target.make
index 3f3fa171..85736f65 100644
--- a/target.make
+++ b/target.make
@@ -271,12 +271,18 @@ SHARED_LIB_LINK_CMD     = \
           rm -f $(LIBRARY_FILE) $(SONAME_LIBRARY_FILE); \
           $(LN_S) $(VERSION_LIBRARY_FILE) $(SONAME_LIBRARY_FILE); \
           $(LN_S) $(SONAME_LIBRARY_FILE) $(LIBRARY_FILE); \
+          if [ x$(LIBRARY_NAME_SUFFIX) = x_d ]; then \
+             $(LN_S) $(LIBRARY_FILE) `echo $(LIBRARY_FILE) | sed -e 's/_d//'`; \
+          fi; \
 	)
 AFTER_INSTALL_SHARED_LIB_COMMAND = \
 	(cd $(GNUSTEP_LIBRARIES); \
           rm -f $(LIBRARY_FILE) $(SONAME_LIBRARY_FILE); \
           $(LN_S) $(VERSION_LIBRARY_FILE) $(SONAME_LIBRARY_FILE); \
           $(LN_S) $(SONAME_LIBRARY_FILE) $(LIBRARY_FILE); \
+          if [ x$(LIBRARY_NAME_SUFFIX) = x_d ]; then \
+             $(LN_S) $(LIBRARY_FILE) `echo $(LIBRARY_FILE) | sed -e 's/_d//'`; \
+          fi; \
 	)
 OBJ_MERGE_CMD		= \
 	$(CC) -nostdlib -r -o $(GNUSTEP_OBJ_DIR)/$(SUBPROJECT_PRODUCT) $^ ;