diff --git a/java/eclipse/Makefile b/java/eclipse/Makefile
index 42c9ba241b4a..33a5d9b55669 100644
--- a/java/eclipse/Makefile
+++ b/java/eclipse/Makefile
@@ -51,11 +51,9 @@ PLIST_SUB+=	MOTIF:="@comment "
 .if defined(WITH_MOZILLA) && ${WITH_MOZILLA} == "firefox"
 BUILD_DEPENDS+=	firefox:${PORTSDIR}/www/firefox
 BROWSER=	firefox
-BROWSER_VER=	`ls /usr/X11R6/lib/firefox/include | sed -e "s/firefox-//"`
 .else
 BUILD_DEPENDS+=	mozilla:${PORTSDIR}/www/mozilla
 BROWSER=	mozilla
-BROWSER_VER=
 .endif
 .endif
 
@@ -70,7 +68,6 @@ PLIST_SUB+=	GNOME:=""
 .endif
 
 MAKE_ARGS=	BROWSER=${BROWSER} \
-		BROWSER_VER=${BROWSER_VER} \
 		ECLIPSE_BUILD=${ECLIPSE_BUILD} \
 		ECLIPSE_ARCH=${ECLIPSE_ARCH} \
 		ECLIPSE_OS=${ECLIPSE_OS} \
diff --git a/java/eclipse/files/make_gtk.mak b/java/eclipse/files/make_gtk.mak
index 222f4435497e..b9d92d68eed1 100644
--- a/java/eclipse/files/make_gtk.mak
+++ b/java/eclipse/files/make_gtk.mak
@@ -77,17 +77,17 @@ MOZILLACFLAGS = -O \
 	-I$(JAVA_HOME)/include	\
 	-I$(JAVA_HOME)/include/bsd	\
 	-I$(JAVA_HOME)/include/freebsd \
-	-include $(MOZILLA_HOME)/lib/$(BROWSER)/include/$(BROWSER)-$(BROWSER_VER)/mozilla-config.h \
-	-I$(MOZILLA_HOME)/lib/$(BROWSER)/include/$(BROWSER)-$(BROWSER_VER) \
-	-I$(MOZILLA_HOME)/lib/$(BROWSER)/include/$(BROWSER)-$(BROWSER_VER)/xpcom \
-	-I$(MOZILLA_HOME)/lib/$(BROWSER)/include/$(BROWSER)-$(BROWSER_VER)/string \
-	-I$(MOZILLA_HOME)/lib/$(BROWSER)/include/$(BROWSER)-$(BROWSER_VER)/nspr \
-	-I$(MOZILLA_HOME)/lib/$(BROWSER)/include/$(BROWSER)-$(BROWSER_VER)/embed_base \
-	-I$(MOZILLA_HOME)/lib/$(BROWSER)/include/$(BROWSER)-$(BROWSER_VER)/gfx
+	-include $(MOZILLA_HOME)/include/$(BROWSER)/mozilla-config.h \
+	-I$(MOZILLA_HOME)/include/$(BROWSER) \
+	-I$(MOZILLA_HOME)/include/$(BROWSER)/xpcom \
+	-I$(MOZILLA_HOME)/include/$(BROWSER)/string \
+	-I$(MOZILLA_HOME)/include/$(BROWSER)/nspr \
+	-I$(MOZILLA_HOME)/include/$(BROWSER)/embed_base \
+	-I$(MOZILLA_HOME)/include/$(BROWSER)/gfx
 endif
 
 MOZILLALIBS = -L$(MOZILLA_HOME)/lib/$(BROWSER) \
-	-L$(MOZILLA_HOME)/lib/$(BROWSER)/lib/$(BROWSER)-$(BROWSER_VER) \
+	-L$(MOZILLA_HOME)/lib/$(BROWSER) \
 	-lgtkembedmoz -lxpcom
 MOZILLALDFLAGS = -s