diff --git a/ChangeLog b/ChangeLog
index 806863d55..14c97cc6f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2013-10-15  Hans-Peter Nilsson  <hp@axis.com>
+
+	* src-release (do-proto-toplevel): Support subdir-path-prefixed
+	files in SUPPORT_FILES.
+	(SIM_SUPPORT_DIRS): New variable.
+	(sim.tar.bz2): New rule.
+
 2013-10-08  Jan-Benedict Glaw  <jbglaw@lug-owl.de>
 
 	* configure.ac: Update from GCC.
diff --git a/src-release b/src-release
index c2f4727b3..b28597c09 100644
--- a/src-release
+++ b/src-release
@@ -165,7 +165,15 @@ do-proto-toplev: $(DEVO_SUPPORT) $(SUPPORT_FILES) texinfo/texinfo.tex
 	    else \
 	      ln -s ../$$d proto-toplev/$$d ; \
 	    fi ; \
-	  else ln -s ../$$d proto-toplev/$$d ; fi ; \
+	  else \
+	    if (echo x$$d | grep / >/dev/null); then \
+	      mkdir -p proto-toplev/`dirname $$d` ; \
+	      x=`dirname $$d` ; \
+	      ln -s ../`echo $$x/ | sed -e 's,[^/]*/,../,g'`$$d proto-toplev/$$d ; \
+	    else \
+	      ln -s ../$$d proto-toplev/$$d ; \
+	    fi ; \
+	  fi ; \
 	done
 	cd etc && $(MAKE) MAKEINFOFLAGS="$(MAKEINFOFLAGS)" info
 	$(MAKE) distclean
@@ -286,6 +294,14 @@ gdb.tar: $(DIST_SUPPORT) $(GDB_SUPPORT_DIRS) gdb
 		MD5PROG="$(MD5PROG)" \
 		SUPPORT_FILES="$(GDB_SUPPORT_DIRS)"
 
+# Corresponding to the CVS "sim" module.
+.PHONY: sim.tar.bz2
+SIM_SUPPORT_DIRS= bfd opcodes libiberty include intl gdb/version.in makefile.vms
+sim.tar.bz2: $(DIST_SUPPORT) $(SIM_SUPPORT_DIRS) sim
+	$(MAKE) -f $(SELF) taz TOOL=sim \
+		MD5PROG="$(MD5PROG)" \
+		SUPPORT_FILES="$(SIM_SUPPORT_DIRS)"
+
 .PHONY: insight.tar.bz2
 INSIGHT_SUPPORT_DIRS= $(GDB_SUPPORT_DIRS) tcl tk itcl libgui
 insight.tar.bz2: $(DIST_SUPPORT) $(GDB_SUPPORT_DIRS) gdb