diff --git a/js/jsd/Makefile.in b/js/jsd/Makefile.in
index bee0d83ab4f..ce24f0268f5 100644
--- a/js/jsd/Makefile.in
+++ b/js/jsd/Makefile.in
@@ -27,30 +27,28 @@ include $(DEPTH)/config/autoconf.mk
 MODULE		= jsdebug
 LIBRARY_NAME	= jsd
 
-# Switching on MOZ_JAVA is a short-term hack. This is really for no Java/IFC
-ifdef MOZ_JAVA
-JAVA_OR_OJI = 1
-endif
-ifdef MOZ_OJI
-JAVA_OR_OJI = 1
-endif
-
-ifdef JAVA_OR_OJI
-DIRS		= classes
-endif
+DIRS 		+= jsdb
 
 REQUIRES	= java js
 
 EXPORTS		= $(srcdir)/jsdebug.h
 
+ifdef JS_THREADSAFE
+DEFINES         += -DJS_THREADSAFE
+endif
+
 CSRCS		= \
 		  jsdebug.c \
+		  jsd_atom.c \
 		  jsd_high.c \
 		  jsd_hook.c \
+		  jsd_lock.c \
+		  jsd_obj.c \
 		  jsd_scpt.c \
 		  jsd_stak.c \
+		  jsd_step.c \
 		  jsd_text.c \
-		  jsd_lock.c \
+		  jsd_val.c \
 		  $(NULL)
 
 ifndef MOZ_JSD
diff --git a/js/jsd/jsdb/Makefile.in b/js/jsd/jsdb/Makefile.in
new file mode 100644
index 00000000000..338323c29e8
--- /dev/null
+++ b/js/jsd/jsdb/Makefile.in
@@ -0,0 +1,51 @@
+#!gmake
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+
+
+DEPTH		= ../../..
+topsrcdir	= @top_srcdir@
+VPATH		= @srcdir@
+srcdir		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+VPATH = ../../src
+
+CSRCS		= \
+		  js.c \
+		  jsdb.c \
+		  jsdrefl.c
+
+PROGRAM		= js
+
+EXTRA_LIBS	= $(NSPR_LIBS)
+
+LIBS		= \
+		  -ljsd \
+		  -lmozjs \
+		  $(NSPR_LIBS)
+
+ifdef JS_THREADSAFE
+DEFINES         += -DJS_THREADSAFE
+endif
+
+DEFINES += -DJSDEBUGGER -DJSDEBUGGER_C_UI -DJSD_LOWLEVEL_SOURCE -DJSFILE
+
+include $(topsrcdir)/config/rules.mk
+
+INCLUDES += -I../../src -I.
+