diff --git a/lang/sun-jre7/Makefile b/lang/sun-jre7/Makefile
index c1857803aa7..0007caa2157 100644
--- a/lang/sun-jre7/Makefile
+++ b/lang/sun-jre7/Makefile
@@ -28,6 +28,9 @@ CONF_FILES=	# empty
 
 .include "../../lang/sun-jre7/Makefile.common"
 
+# Default DISTFILES
+DISTFILES?=	${DISTNAME}${EXTRACT_SUFX}
+
 SFILES_MK=sfiles-${DIST_OS}-${EMUL_ARCH}.mk
 
 .sinclude "${SFILES_MK}"
@@ -53,7 +56,7 @@ PLIST_SRC=	PLIST.${DIST_OS}-${EMUL_ARCH}
 
 PLIST_VARS+=	jce native
 .if !empty(PKG_OPTIONS:Msun-jre-jce) || make(distinfo)
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} UnlimitedJCEPolicyJDK7.zip
+DISTFILES+=	UnlimitedJCEPolicyJDK7.zip
 .endif
 .if !empty(PKG_OPTIONS:Msun-jre-jce)
 PLIST.jce=	yes
@@ -117,16 +120,17 @@ post-extract:
 	${TOUCH} ${WRKSRC}/.systemPrefs/.system.lock
 	${TOUCH} ${WRKSRC}/.systemPrefs/.systemRootModFile
 
-#do-configure:
-#	cd ${WRKSRC}/lib; for file in ${SFILES}; do			\
-#		-${MV} -f $$file $$file.default;				\
-#	done
+do-configure:
+	cd ${WRKSRC}/lib; for file in ${SFILES}; do			\
+		[ -f $$file ] && ${MV} -f $$file $$file.default || true;	\
+	done
 
 pre-install:
 	# This file is generated the *first* time the package is built on a box
 	${RM} -f ${WRKSRC}/lib/servicetag/registration.xml
 .if !empty(PKG_OPTIONS:Msun-jre-jce)
 	cd ${WRKDIR}/UnlimitedJCEPolicy ; pax -rw -pe -v . ${WRKSRC}/lib/security
+	${RM} -f ${WRKSRC}/lib/security/README.txt
 .endif
 
 #