diff --git a/.gitignore b/.gitignore
index 472c090..082e3bc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,3 +20,6 @@ otp_src_R14A.tar.gz
 /otp_doc_html_R15B01.tar.gz
 /otp_doc_man_R15B01.tar.gz
 /otp_src_R15B01.tar.gz
+/otp_doc_html_R15B02.tar.gz
+/otp_doc_man_R15B02.tar.gz
+/otp_src_R15B02.tar.gz
diff --git a/erlang.spec b/erlang.spec
index 73f6ff0..89f0818 100644
--- a/erlang.spec
+++ b/erlang.spec
@@ -1,6 +1,6 @@
 %global upstream_ver R15B
 # Do NOT change %%{upstream_rel} unless UPSTREAM has actually changed it!
-%global upstream_rel 01
+%global upstream_rel 02
 #%%global upstream_rel %%{nil}
 # Use %%{nil} for %%{upstream_rel} for tracking source like otp_src_R14B.tar.gz,
 # and 01 %%{upstream_rel} for tracking source like otp_src_R14B01.tar.gz.
@@ -25,7 +25,7 @@
 
 Name:		erlang
 Version:	%{upstream_ver}
-Release:	%{upstream_rel_for_rpm}.4%{?dist}.2
+Release:	%{upstream_rel_for_rpm}.1%{?dist}
 Summary:	General-purpose programming language and runtime environment
 
 Group:		Development/Languages
@@ -2397,6 +2397,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Sep 10 2012 Peter Lemenkov <lemenkov@gmail.com> - R15B-02.1
+- Ver. R15B02
+
 * Wed Aug 15 2012 Karsten Hopp <karsten@redhat.com> R15B-01.4.2
 - set BASE_OPTIONS to -Xmx1536m on ppc*
 
diff --git a/otp-0001-Do-not-format-man-pages-and-do-not-install-miscellan.patch b/otp-0001-Do-not-format-man-pages-and-do-not-install-miscellan.patch
index 82fb476..524ad7f 100644
--- a/otp-0001-Do-not-format-man-pages-and-do-not-install-miscellan.patch
+++ b/otp-0001-Do-not-format-man-pages-and-do-not-install-miscellan.patch
@@ -5,27 +5,27 @@ Subject: [PATCH] Do not format man-pages and do not install miscellaneous
 
 Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
 ---
- erts/etc/common/Makefile.in |    4 ----
- erts/etc/unix/Install.src   |   10 ----------
+ erts/etc/common/Makefile.in |  4 ----
+ erts/etc/unix/Install.src   | 10 ----------
  2 files changed, 14 deletions(-)
 
 diff --git a/erts/etc/common/Makefile.in b/erts/etc/common/Makefile.in
-index 28c5e5c..5f7aaf1 100644
+index 83fe97d..f77b485 100644
 --- a/erts/etc/common/Makefile.in
 +++ b/erts/etc/common/Makefile.in
-@@ -565,10 +565,6 @@ endif
+@@ -568,10 +568,6 @@ endif
  ifneq ($(INSTALL_TOP_BIN),)
- 	$(INSTALL_PROGRAM) $(INSTALL_TOP_BIN) $(RELEASE_PATH)
+ 	$(INSTALL_PROGRAM) $(INSTALL_TOP_BIN) "$(RELEASE_PATH)"
  endif
 -ifneq ($(INSTALL_MISC),)
--	$(INSTALL_DIR) $(RELEASE_PATH)/misc
--	$(INSTALL_SCRIPT) $(INSTALL_MISC) $(RELEASE_PATH)/misc
+-	$(INSTALL_DIR) "$(RELEASE_PATH)/misc"
+-	$(INSTALL_SCRIPT) $(INSTALL_MISC) "$(RELEASE_PATH)/misc"
 -endif
  ifneq ($(INSTALL_ERL_OSE),)
- 	$(INSTALL_DIR) $(RELEASE_PATH)/build_erl_ose
+ 	$(INSTALL_DIR) "$(RELEASE_PATH)/build_erl_ose"
  	cd $(OSEETC) && $(TAR) erl_ose_$(SYSTEM_VSN).tar $(INSTALL_ERL_OSE)
 diff --git a/erts/etc/unix/Install.src b/erts/etc/unix/Install.src
-index 8f40c43..7f354cf 100644
+index 2dcd070..0bf82f1 100644
 --- a/erts/etc/unix/Install.src
 +++ b/erts/etc/unix/Install.src
 @@ -143,14 +143,4 @@ cp -p ../releases/%I_SYSTEM_VSN%/start_*.boot .
@@ -36,10 +36,10 @@ index 8f40c43..7f354cf 100644
 -# Fixing the man pages
 -#
 -
--if [ -d $ERL_ROOT/man ]
+-if [ -d "$ERL_ROOT/man" ]
 -then
--    cd $ERL_ROOT
--    ./misc/format_man_pages $ERL_ROOT
+-    cd "$ERL_ROOT"
+-    ./misc/format_man_pages "$ERL_ROOT"
 -fi
 -
  exit 0
diff --git a/otp-0002-Remove-rpath.patch b/otp-0002-Remove-rpath.patch
index d9b240d..03fc5eb 100644
--- a/otp-0002-Remove-rpath.patch
+++ b/otp-0002-Remove-rpath.patch
@@ -4,12 +4,12 @@ Subject: [PATCH] Remove rpath
 
 Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
 ---
- lib/crypto/c_src/Makefile.in |    2 +-
- lib/crypto/priv/Makefile     |    2 +-
+ lib/crypto/c_src/Makefile.in | 2 +-
+ lib/crypto/priv/Makefile     | 2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/lib/crypto/c_src/Makefile.in b/lib/crypto/c_src/Makefile.in
-index 2855376..3f0f5c4 100644
+index ffd556c..80e95ef 100644
 --- a/lib/crypto/c_src/Makefile.in
 +++ b/lib/crypto/c_src/Makefile.in
 @@ -84,7 +84,7 @@ endif
@@ -18,7 +18,7 @@ index 2855376..3f0f5c4 100644
  ifeq ($(DYNAMIC_CRYPTO_LIB),yes)
 -SSL_DED_LD_RUNTIME_LIBRARY_PATH = @SSL_DED_LD_RUNTIME_LIBRARY_PATH@
 +SSL_DED_LD_RUNTIME_LIBRARY_PATH =
- CRYPTO_LINK_LIB=$(SSL_DED_LD_RUNTIME_LIBRARY_PATH) -L$(SSL_LIBDIR) -l$(SSL_CRYPTO_LIBNAME) -l$(SSL_SSL_LIBNAME)
+ CRYPTO_LINK_LIB=$(SSL_DED_LD_RUNTIME_LIBRARY_PATH) -L$(SSL_LIBDIR) -l$(SSL_CRYPTO_LIBNAME)
  else
  SSL_DED_LD_RUNTIME_LIBRARY_PATH=
 diff --git a/lib/crypto/priv/Makefile b/lib/crypto/priv/Makefile
diff --git a/otp-0003-Do-not-install-C-sources.patch b/otp-0003-Do-not-install-C-sources.patch
index ce673a0..9e6a72d 100644
--- a/otp-0003-Do-not-install-C-sources.patch
+++ b/otp-0003-Do-not-install-C-sources.patch
@@ -6,159 +6,160 @@ Don't install *.c and *.o files at all.
 
 Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
 ---
- lib/asn1/c_src/Makefile             |    2 --
- lib/crypto/c_src/Makefile.in        |    3 ---
- lib/erl_interface/src/Makefile.in   |   18 ------------------
- lib/ic/c_src/Makefile.in            |    2 --
- lib/megaco/src/flex/Makefile.in     |    2 +-
- lib/odbc/c_src/Makefile.in          |    3 ---
- lib/os_mon/c_src/Makefile.in        |    1 -
- lib/runtime_tools/c_src/Makefile.in |    2 --
- lib/tools/c_src/Makefile.in         |    2 --
- 9 files changed, 1 insertion(+), 34 deletions(-)
+ lib/asn1/c_src/Makefile             |  2 --
+ lib/crypto/c_src/Makefile.in        |  3 ---
+ lib/erl_interface/src/Makefile.in   | 18 ------------------
+ lib/ic/c_src/Makefile.in            |  2 --
+ lib/megaco/src/flex/Makefile.in     |  2 +-
+ lib/odbc/c_src/Makefile.in          |  3 ---
+ lib/os_mon/c_src/Makefile.in        |  2 --
+ lib/runtime_tools/c_src/Makefile.in |  2 --
+ lib/tools/c_src/Makefile.in         |  2 --
+ 9 files changed, 1 insertion(+), 35 deletions(-)
 
 diff --git a/lib/asn1/c_src/Makefile b/lib/asn1/c_src/Makefile
-index 8c06be5..7013289 100644
+index a73d01a..102d4fb 100644
 --- a/lib/asn1/c_src/Makefile
 +++ b/lib/asn1/c_src/Makefile
 @@ -112,8 +112,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk
  release_spec: opt
- 	$(INSTALL_DIR) $(RELSYSDIR)/priv/lib
- 	$(INSTALL_PROGRAM) $(NIF_SHARED_OBJ_FILE) $(RELSYSDIR)/priv/lib
--	$(INSTALL_DIR) $(RELSYSDIR)/c_src
--	$(INSTALL_DATA) *.c $(RELSYSDIR)/c_src
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/priv/lib"
+ 	$(INSTALL_PROGRAM) $(NIF_SHARED_OBJ_FILE) "$(RELSYSDIR)/priv/lib"
+-	$(INSTALL_DIR) "$(RELSYSDIR)/c_src"
+-	$(INSTALL_DATA) *.c "$(RELSYSDIR)/c_src"
  
  release_docs_spec:
  
 diff --git a/lib/crypto/c_src/Makefile.in b/lib/crypto/c_src/Makefile.in
-index 3f0f5c4..ba7ab1c 100644
+index 80e95ef..c644ad2 100644
 --- a/lib/crypto/c_src/Makefile.in
 +++ b/lib/crypto/c_src/Makefile.in
 @@ -133,10 +133,7 @@ docs:
  include $(ERL_TOP)/make/otp_release_targets.mk
  
  release_spec: opt
--	$(INSTALL_DIR) $(RELSYSDIR)/priv/obj
- 	$(INSTALL_DIR) $(RELSYSDIR)/priv/lib
--	$(INSTALL_DATA) $(NIF_MAKEFILE) $(RELSYSDIR)/priv/obj
--	$(INSTALL_PROGRAM) $(OBJS) $(RELSYSDIR)/priv/obj
- 	$(INSTALL_PROGRAM) $(NIF_LIB) $(RELSYSDIR)/priv/lib
+-	$(INSTALL_DIR) "$(RELSYSDIR)/priv/obj"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/priv/lib"
+-	$(INSTALL_DATA) $(NIF_MAKEFILE) "$(RELSYSDIR)/priv/obj"
+-	$(INSTALL_PROGRAM) $(OBJS) "$(RELSYSDIR)/priv/obj"
+ 	$(INSTALL_PROGRAM) $(NIF_LIB) "$(RELSYSDIR)/priv/lib"
  
  release_docs_spec:
 diff --git a/lib/erl_interface/src/Makefile.in b/lib/erl_interface/src/Makefile.in
-index d6b0ca1..91a2cc9 100644
+index cb41391..9aeba86 100644
 --- a/lib/erl_interface/src/Makefile.in
 +++ b/lib/erl_interface/src/Makefile.in
 @@ -846,29 +846,11 @@ release: opt
- 	$(INSTALL_DIR) $(RELSYSDIR)/include
- 	$(INSTALL_DIR) $(RELSYSDIR)/lib
- 	$(INSTALL_DIR) $(RELSYSDIR)/bin
--	$(INSTALL_DIR) $(RELSYSDIR)/src/auxdir
--	$(INSTALL_DIR) $(RELSYSDIR)/src/connect
--	$(INSTALL_DIR) $(RELSYSDIR)/src/decode
--	$(INSTALL_DIR) $(RELSYSDIR)/src/encode
--	$(INSTALL_DIR) $(RELSYSDIR)/src/epmd
--	$(INSTALL_DIR) $(RELSYSDIR)/src/legacy
--	$(INSTALL_DIR) $(RELSYSDIR)/src/misc
--	$(INSTALL_DIR) $(RELSYSDIR)/src/prog
--	$(INSTALL_DIR) $(RELSYSDIR)/src/registry
- 	$(INSTALL_DATA) $(HEADERS)     $(RELSYSDIR)/include
- 	$(INSTALL_DATA) $(OBJ_TARGETS) $(RELSYSDIR)/lib
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/include"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/lib"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/bin"
+-	$(INSTALL_DIR) "$(RELSYSDIR)/src/auxdir"
+-	$(INSTALL_DIR) "$(RELSYSDIR)/src/connect"
+-	$(INSTALL_DIR) "$(RELSYSDIR)/src/decode"
+-	$(INSTALL_DIR) "$(RELSYSDIR)/src/encode"
+-	$(INSTALL_DIR) "$(RELSYSDIR)/src/epmd"
+-	$(INSTALL_DIR) "$(RELSYSDIR)/src/legacy"
+-	$(INSTALL_DIR) "$(RELSYSDIR)/src/misc"
+-	$(INSTALL_DIR) "$(RELSYSDIR)/src/prog"
+-	$(INSTALL_DIR) "$(RELSYSDIR)/src/registry"
+ 	$(INSTALL_DATA) $(HEADERS)     "$(RELSYSDIR)/include"
+ 	$(INSTALL_DATA) $(OBJ_TARGETS) "$(RELSYSDIR)/lib"
  ifneq ($(EXE_TARGETS),)
- 	$(INSTALL_PROGRAM) $(EXE_TARGETS) $(RELSYSDIR)/bin
+ 	$(INSTALL_PROGRAM) $(EXE_TARGETS) "$(RELSYSDIR)/bin"
  endif
--	$(INSTALL_DATA) $(EXTRA)        $(RELSYSDIR)/src
--	$(INSTALL_DATA) connect/*.[ch]  $(RELSYSDIR)/src/connect
--	$(INSTALL_DATA) decode/*.[ch]   $(RELSYSDIR)/src/decode
--	$(INSTALL_DATA) encode/*.[ch]   $(RELSYSDIR)/src/encode
--	$(INSTALL_DATA) epmd/*.[ch]     $(RELSYSDIR)/src/epmd
--	$(INSTALL_DATA) misc/*.[ch]     $(RELSYSDIR)/src/misc
--	$(INSTALL_DATA) registry/*.[ch] $(RELSYSDIR)/src/registry
--	$(INSTALL_DATA) legacy/*.[ch]   $(RELSYSDIR)/src/legacy
--	$(INSTALL_DATA) prog/*.[ch]     $(RELSYSDIR)/src/prog
+-	$(INSTALL_DATA) $(EXTRA)        "$(RELSYSDIR)/src"
+-	$(INSTALL_DATA) connect/*.[ch]  "$(RELSYSDIR)/src/connect"
+-	$(INSTALL_DATA) decode/*.[ch]   "$(RELSYSDIR)/src/decode"
+-	$(INSTALL_DATA) encode/*.[ch]   "$(RELSYSDIR)/src/encode"
+-	$(INSTALL_DATA) epmd/*.[ch]     "$(RELSYSDIR)/src/epmd"
+-	$(INSTALL_DATA) misc/*.[ch]     "$(RELSYSDIR)/src/misc"
+-	$(INSTALL_DATA) registry/*.[ch] "$(RELSYSDIR)/src/registry"
+-	$(INSTALL_DATA) legacy/*.[ch]   "$(RELSYSDIR)/src/legacy"
+-	$(INSTALL_DATA) prog/*.[ch]     "$(RELSYSDIR)/src/prog"
  
  release_docs:
  
 diff --git a/lib/ic/c_src/Makefile.in b/lib/ic/c_src/Makefile.in
-index 5e034c4..c101201 100644
+index de46ead..b30ce1e 100644
 --- a/lib/ic/c_src/Makefile.in
 +++ b/lib/ic/c_src/Makefile.in
 @@ -140,10 +140,8 @@ $(OBJDIR)/%.o: %.c
  include $(ERL_TOP)/make/otp_release_targets.mk
  
  release_spec: opt
--	$(INSTALL_DIR) $(RELSYSDIR)/c_src
- 	$(INSTALL_DIR) $(RELSYSDIR)/include
- 	$(INSTALL_DIR) $(RELSYSDIR)/priv/lib
--	$(INSTALL_DATA) ic.c ic_tmo.c $(RELSYSDIR)/c_src
- 	$(INSTALL_DATA) $(IDL_FILES) $(H_FILES) $(RELSYSDIR)/include
- 	$(INSTALL_DATA) $(LIBRARY) $(RELSYSDIR)/priv/lib
+-	$(INSTALL_DIR) "$(RELSYSDIR)/c_src"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/include"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/priv/lib"
+-	$(INSTALL_DATA) ic.c ic_tmo.c "$(RELSYSDIR)/c_src"
+ 	$(INSTALL_DATA) $(IDL_FILES) $(H_FILES) "$(RELSYSDIR)/include"
+ 	$(INSTALL_DATA) $(LIBRARY) "$(RELSYSDIR)/priv/lib"
  
 diff --git a/lib/megaco/src/flex/Makefile.in b/lib/megaco/src/flex/Makefile.in
-index 7d82644..27275f2 100644
+index 69c2425..b36ef26 100644
 --- a/lib/megaco/src/flex/Makefile.in
 +++ b/lib/megaco/src/flex/Makefile.in
 @@ -279,7 +279,7 @@ release_spec: opt
- 	$(INSTALL_DATA) $(ERL_FILES) $(INTERNAL_HRL_FILES) $(RELSYSDIR)/src/flex
- 	$(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
+ 	$(INSTALL_DATA) $(ERL_FILES) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src/flex"
+ 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
  ifeq ($(ENABLE_MEGACO_FLEX_SCANNER),true)
--	$(INSTALL_DATA) $(FLEX_FILES) $(C_TARGETS) $(RELSYSDIR)/src/flex
-+	$(INSTALL_DATA) $(FLEX_FILES) $(RELSYSDIR)/src/flex
- 	$(INSTALL_PROGRAM) $(SOLIBS) $(RELSYSDIR)/priv/lib
+-	$(INSTALL_DATA) $(FLEX_FILES) $(C_TARGETS) "$(RELSYSDIR)/src/flex"
++	$(INSTALL_DATA) $(FLEX_FILES) "$(RELSYSDIR)/src/flex"
+ 	$(INSTALL_PROGRAM) $(SOLIBS) "$(RELSYSDIR)/priv/lib"
  endif
  
 diff --git a/lib/odbc/c_src/Makefile.in b/lib/odbc/c_src/Makefile.in
-index 3a96a53..bbf0d7b 100644
+index 026da39..3a568e4 100644
 --- a/lib/odbc/c_src/Makefile.in
 +++ b/lib/odbc/c_src/Makefile.in
 @@ -128,11 +128,8 @@ include $(ERL_TOP)/make/otp_release_targets.mk
  
  release_spec: opt
  ifdef EXE_TARGET
--	$(INSTALL_DIR) $(RELSYSDIR)/c_src
--	$(INSTALL_DATA) $(C_FILES) $(H_FILES) $(RELSYSDIR)/c_src
- 	$(INSTALL_DIR) $(RELSYSDIR)/priv
- 	$(INSTALL_DIR) $(RELSYSDIR)/priv/bin
--	$(INSTALL_DIR) $(RELSYSDIR)/priv/obj
- 	$(INSTALL_PROGRAM) $(EXE_TARGET) $(RELSYSDIR)/priv/bin
+-	$(INSTALL_DIR) "$(RELSYSDIR)/c_src"
+-	$(INSTALL_DATA) $(C_FILES) $(H_FILES) "$(RELSYSDIR)/c_src"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/priv"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/priv/bin"
+-	$(INSTALL_DIR) "$(RELSYSDIR)/priv/obj"
+ 	$(INSTALL_PROGRAM) $(EXE_TARGET) "$(RELSYSDIR)/priv/bin"
  endif
  
 diff --git a/lib/os_mon/c_src/Makefile.in b/lib/os_mon/c_src/Makefile.in
-index bac0413..5c32296 100644
+index 2b16789..1241014 100644
 --- a/lib/os_mon/c_src/Makefile.in
 +++ b/lib/os_mon/c_src/Makefile.in
-@@ -132,7 +132,6 @@ release_spec:
+@@ -131,8 +131,6 @@ ifeq ($(findstring vxworks_simso,$(TARGET)),vxworks_simso)
+ release_spec:
  else
  release_spec: opt
- 	$(INSTALL_DIR) $(RELSYSDIR)/src
--	$(INSTALL_DATA) $(C_FILES) $(RELSYSDIR)/src
- 	$(INSTALL_DIR) $(RELSYSDIR)/priv/bin
- 	$(INSTALL_PROGRAM) $(TARGET_FILES) $(RELSYSDIR)/priv/bin
+-	$(INSTALL_DIR) "$(RELSYSDIR)/src"
+-	$(INSTALL_DATA) $(C_FILES) "$(RELSYSDIR)/src"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/priv/bin"
+ 	$(INSTALL_PROGRAM) $(TARGET_FILES) "$(RELSYSDIR)/priv/bin"
  endif
 diff --git a/lib/runtime_tools/c_src/Makefile.in b/lib/runtime_tools/c_src/Makefile.in
-index cbbcfa2..20f1ca6 100644
+index 754e6cc..1c367ef 100644
 --- a/lib/runtime_tools/c_src/Makefile.in
 +++ b/lib/runtime_tools/c_src/Makefile.in
 @@ -193,9 +193,7 @@ docs:
  include $(ERL_TOP)/make/otp_release_targets.mk
  
  release_spec: opt
--	$(INSTALL_DIR) $(RELSYSDIR)/priv/obj
- 	$(INSTALL_DIR) $(RELSYSDIR)/priv/lib
--	$(INSTALL_PROGRAM) $(DYNTRACE_OBJS) $(RELSYSDIR)/priv/obj
- 	$(INSTALL_PROGRAM) $(NIF_LIB) $(SOLIBS) $(RELSYSDIR)/priv/lib
+-	$(INSTALL_DIR) "$(RELSYSDIR)/priv/obj"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/priv/lib"
+-	$(INSTALL_PROGRAM) $(DYNTRACE_OBJS) "$(RELSYSDIR)/priv/obj"
+ 	$(INSTALL_PROGRAM) $(NIF_LIB) $(SOLIBS) "$(RELSYSDIR)/priv/lib"
  
  release_docs_spec:
 diff --git a/lib/tools/c_src/Makefile.in b/lib/tools/c_src/Makefile.in
-index b8c4aed..f7f5dff 100644
+index 0382d32..f74eb5a 100644
 --- a/lib/tools/c_src/Makefile.in
 +++ b/lib/tools/c_src/Makefile.in
 @@ -188,8 +188,6 @@ include ../vsn.mk
  RELSYSDIR = $(RELEASE_PATH)/lib/tools-$(TOOLS_VSN)
  
  release_spec: all
--	$(INSTALL_DIR) $(RELSYSDIR)/c_src
--	$(INSTALL_DATA) $(EMEM_SRCS) $(EMEM_HEADERS) $(RELSYSDIR)/c_src
+-	$(INSTALL_DIR) "$(RELSYSDIR)/c_src"
+-	$(INSTALL_DATA) $(EMEM_SRCS) $(EMEM_HEADERS) "$(RELSYSDIR)/c_src"
  ifneq ($(PROGS),)
- 	$(INSTALL_DIR) $(RELSYSDIR)/bin
- 	$(INSTALL_PROGRAM) $(PROGS) $(RELSYSDIR)/bin
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/bin"
+ 	$(INSTALL_PROGRAM) $(PROGS) "$(RELSYSDIR)/bin"
diff --git a/otp-0004-Do-not-install-Java-sources.patch b/otp-0004-Do-not-install-Java-sources.patch
index 3804969..301d66b 100644
--- a/otp-0004-Do-not-install-Java-sources.patch
+++ b/otp-0004-Do-not-install-Java-sources.patch
@@ -4,33 +4,33 @@ Subject: [PATCH] Do not install Java sources
 
 Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
 ---
- lib/ic/java_src/com/ericsson/otp/ic/Makefile             |    2 --
- lib/jinterface/java_src/com/ericsson/otp/erlang/Makefile |    2 --
+ lib/ic/java_src/com/ericsson/otp/ic/Makefile             | 2 --
+ lib/jinterface/java_src/com/ericsson/otp/erlang/Makefile | 2 --
  2 files changed, 4 deletions(-)
 
 diff --git a/lib/ic/java_src/com/ericsson/otp/ic/Makefile b/lib/ic/java_src/com/ericsson/otp/ic/Makefile
-index f730749..f7ec624 100644
+index cf4c353..57f64d9 100644
 --- a/lib/ic/java_src/com/ericsson/otp/ic/Makefile
 +++ b/lib/ic/java_src/com/ericsson/otp/ic/Makefile
 @@ -109,8 +109,6 @@ docs:
  include $(ERL_TOP)/make/otp_release_targets.mk
  
  release_spec: opt
--	$(INSTALL_DIR) $(RELSYSDIR)/java_src/com/ericsson/otp/ic
--	$(INSTALL_DATA) $(JAVA_FILES) $(RELSYSDIR)/java_src/com/ericsson/otp/ic
- 	$(INSTALL_DIR) $(RELSYSDIR)/priv
- 	$(INSTALL_DATA) $(JAVA_DEST_ROOT)$(JARFILE) $(RELSYSDIR)/priv
+-	$(INSTALL_DIR) "$(RELSYSDIR)/java_src/com/ericsson/otp/ic"
+-	$(INSTALL_DATA) $(JAVA_FILES) "$(RELSYSDIR)/java_src/com/ericsson/otp/ic"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/priv"
+ 	$(INSTALL_DATA) $(JAVA_DEST_ROOT)$(JARFILE) "$(RELSYSDIR)/priv"
  
 diff --git a/lib/jinterface/java_src/com/ericsson/otp/erlang/Makefile b/lib/jinterface/java_src/com/ericsson/otp/erlang/Makefile
-index 365798e..68deb9c 100644
+index 8ae63a1..8605a20 100644
 --- a/lib/jinterface/java_src/com/ericsson/otp/erlang/Makefile
 +++ b/lib/jinterface/java_src/com/ericsson/otp/erlang/Makefile
 @@ -99,8 +99,6 @@ release release_docs release_tests release_html:
- 	$(MAKE) $(MFLAGS) RELEASE_PATH=$(RELEASE_PATH) $(TARGET_MAKEFILE)  $@_spec
+ 	$(MAKE) $(MFLAGS) RELEASE_PATH="$(RELEASE_PATH)" $(TARGET_MAKEFILE)  $@_spec
  
  release_spec: opt
--	$(INSTALL_DIR) $(RELSYSDIR)/java_src/com/ericsson/otp/erlang
--	$(INSTALL_DATA) $(JAVA_SRC) $(RELSYSDIR)/java_src/com/ericsson/otp/erlang
- 	$(INSTALL_DIR) $(RELSYSDIR)/priv
- 	$(INSTALL_DATA) $(JAVA_DEST_ROOT)$(JARFILE) $(RELSYSDIR)/priv
+-	$(INSTALL_DIR) "$(RELSYSDIR)/java_src/com/ericsson/otp/erlang"
+-	$(INSTALL_DATA) $(JAVA_SRC) "$(RELSYSDIR)/java_src/com/ericsson/otp/erlang"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/priv"
+ 	$(INSTALL_DATA) $(JAVA_DEST_ROOT)$(JARFILE) "$(RELSYSDIR)/priv"
  
diff --git a/otp-0005-Do-not-install-nteventlog-and-related-doc-files-on-n.patch b/otp-0005-Do-not-install-nteventlog-and-related-doc-files-on-n.patch
index 7f5dc25..988069e 100644
--- a/otp-0005-Do-not-install-nteventlog-and-related-doc-files-on-n.patch
+++ b/otp-0005-Do-not-install-nteventlog-and-related-doc-files-on-n.patch
@@ -5,12 +5,12 @@ Subject: [PATCH] Do not install nteventlog and related doc-files on non-win32
 
 Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
 ---
- lib/os_mon/doc/src/Makefile |    7 ++++++-
- lib/os_mon/src/Makefile     |   11 ++++++++++-
+ lib/os_mon/doc/src/Makefile |  7 ++++++-
+ lib/os_mon/src/Makefile     | 11 ++++++++++-
  2 files changed, 16 insertions(+), 2 deletions(-)
 
 diff --git a/lib/os_mon/doc/src/Makefile b/lib/os_mon/doc/src/Makefile
-index c976574..6267378 100644
+index 08fd23e..5606cfc 100644
 --- a/lib/os_mon/doc/src/Makefile
 +++ b/lib/os_mon/doc/src/Makefile
 @@ -35,12 +35,17 @@ RELSYSDIR = $(RELEASE_PATH)/lib/$(APPLICATION)-$(VSN)
@@ -33,7 +33,7 @@ index c976574..6267378 100644
  XML_REF6_FILES = os_mon_app.xml 
  
 diff --git a/lib/os_mon/src/Makefile b/lib/os_mon/src/Makefile
-index 9a75446..a492a63 100644
+index 864d7a0..79a4076 100644
 --- a/lib/os_mon/src/Makefile
 +++ b/lib/os_mon/src/Makefile
 @@ -33,8 +33,13 @@ RELSYSDIR = $(RELEASE_PATH)/lib/os_mon-$(VSN)
diff --git a/otp-0006-Do-not-install-VxWorks-specific-docs.patch b/otp-0006-Do-not-install-VxWorks-specific-docs.patch
index 76a8803..4be897b 100644
--- a/otp-0006-Do-not-install-VxWorks-specific-docs.patch
+++ b/otp-0006-Do-not-install-VxWorks-specific-docs.patch
@@ -4,11 +4,11 @@ Subject: [PATCH] Do not install VxWorks-specific docs
 
 Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
 ---
- erts/doc/src/Makefile |    1 -
+ erts/doc/src/Makefile | 1 -
  1 file changed, 1 deletion(-)
 
 diff --git a/erts/doc/src/Makefile b/erts/doc/src/Makefile
-index cfa5527..d18b615 100644
+index da245d7..a494b3a 100644
 --- a/erts/doc/src/Makefile
 +++ b/erts/doc/src/Makefile
 @@ -55,7 +55,6 @@ XML_REF3_EFILES = \
diff --git a/otp-0007-Do-not-install-erlang-sources.patch b/otp-0007-Do-not-install-erlang-sources.patch
index 4c97f1f..732de80 100644
--- a/otp-0007-Do-not-install-erlang-sources.patch
+++ b/otp-0007-Do-not-install-erlang-sources.patch
@@ -7,464 +7,465 @@ Don't install *.erl, *.xrl, *.yrl, and *.asn1 files at all.
 Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
 Signed-off-by: Hans Ulrich Niedermann <hun@n-dimensional.de>
 ---
- erts/preloaded/src/Makefile        |    2 --
- lib/appmon/src/Makefile            |    2 +-
- lib/asn1/src/Makefile              |    2 +-
- lib/common_test/src/Makefile       |    2 +-
- lib/compiler/src/Makefile          |    4 ++--
- lib/cosEvent/src/Makefile          |    2 +-
- lib/cosEventDomain/src/Makefile    |    2 +-
- lib/cosFileTransfer/src/Makefile   |    3 +--
- lib/cosNotification/src/Makefile   |    3 +--
- lib/cosProperty/src/Makefile       |    3 +--
- lib/cosTime/src/Makefile           |    3 +--
- lib/cosTransactions/src/Makefile   |    2 +-
- lib/crypto/src/Makefile            |    2 --
- lib/debugger/src/Makefile          |    2 +-
- lib/dialyzer/src/Makefile          |    2 +-
- lib/diameter/src/Makefile          |    7 ++-----
- lib/edoc/src/Makefile              |    2 +-
- lib/eldap/src/Makefile             |    4 ----
- lib/erl_docgen/src/Makefile        |    2 --
- lib/et/src/Makefile                |    1 -
- lib/eunit/src/Makefile             |    2 --
- lib/gs/src/Makefile                |    4 ++--
- lib/hipe/cerl/Makefile             |    2 +-
- lib/hipe/flow/Makefile             |    2 +-
- lib/hipe/icode/Makefile            |    2 +-
- lib/hipe/main/Makefile             |    2 +-
- lib/hipe/misc/Makefile             |    2 +-
- lib/hipe/rtl/Makefile              |    2 +-
- lib/hipe/util/Makefile             |    3 ---
- lib/ic/src/Makefile                |    2 +-
- lib/inets/src/ftp/Makefile         |    2 +-
- lib/inets/src/http_client/Makefile |    2 +-
- lib/inets/src/http_lib/Makefile    |    2 +-
- lib/inets/src/http_server/Makefile |    2 +-
- lib/inets/src/inets_app/Makefile   |    2 +-
- lib/inets/src/tftp/Makefile        |    2 +-
- lib/inviso/src/Makefile            |    2 --
- lib/kernel/src/Makefile            |    1 -
- lib/megaco/src/app/Makefile        |    2 +-
- lib/megaco/src/binary/Makefile     |    2 +-
- lib/megaco/src/engine/Makefile     |    2 +-
- lib/megaco/src/flex/Makefile.in    |    1 -
- lib/megaco/src/tcp/Makefile        |    2 +-
- lib/megaco/src/text/Makefile       |    2 +-
- lib/megaco/src/udp/Makefile        |    2 +-
- lib/mnesia/src/Makefile            |    2 +-
- lib/observer/src/Makefile          |    1 -
- lib/odbc/src/Makefile              |    2 +-
- lib/orber/COSS/CosNaming/Makefile  |    4 ++--
- lib/orber/src/Makefile             |    2 +-
- lib/os_mon/src/Makefile            |    1 -
- lib/otp_mibs/src/Makefile          |    2 --
- lib/parsetools/src/Makefile        |    2 --
- lib/percept/src/Makefile           |    2 --
- lib/pman/src/Makefile              |    2 +-
- lib/public_key/src/Makefile        |    4 ----
- lib/reltool/src/Makefile           |    2 +-
- lib/runtime_tools/src/Makefile     |    2 --
- lib/sasl/src/Makefile              |    1 -
- lib/snmp/src/agent/Makefile        |    2 +-
- lib/snmp/src/app/Makefile          |    2 +-
- lib/snmp/src/compile/Makefile      |    2 +-
- lib/snmp/src/manager/Makefile      |    2 +-
- lib/snmp/src/misc/Makefile         |    2 +-
- lib/ssh/src/Makefile               |    2 +-
- lib/ssl/src/Makefile               |    2 +-
- lib/stdlib/src/Makefile            |    1 -
- lib/syntax_tools/src/Makefile      |    2 --
- lib/test_server/src/Makefile       |    1 -
- lib/toolbar/src/Makefile           |    2 +-
- lib/tools/src/Makefile             |    2 +-
- lib/tv/src/Makefile                |    2 +-
- lib/typer/src/Makefile             |    2 --
- lib/webtool/src/Makefile           |    2 --
- lib/wx/src/Makefile                |    4 ++--
- lib/xmerl/src/Makefile             |    4 +---
- 76 files changed, 58 insertions(+), 110 deletions(-)
+ erts/preloaded/src/Makefile        | 2 --
+ lib/appmon/src/Makefile            | 2 +-
+ lib/asn1/src/Makefile              | 2 +-
+ lib/common_test/src/Makefile       | 2 +-
+ lib/compiler/src/Makefile          | 4 ++--
+ lib/cosEvent/src/Makefile          | 2 +-
+ lib/cosEventDomain/src/Makefile    | 2 +-
+ lib/cosFileTransfer/src/Makefile   | 4 +---
+ lib/cosNotification/src/Makefile   | 3 +--
+ lib/cosProperty/src/Makefile       | 3 +--
+ lib/cosTime/src/Makefile           | 3 +--
+ lib/cosTransactions/src/Makefile   | 2 +-
+ lib/crypto/src/Makefile            | 2 --
+ lib/debugger/src/Makefile          | 2 +-
+ lib/dialyzer/src/Makefile          | 2 +-
+ lib/diameter/src/Makefile          | 7 ++-----
+ lib/edoc/src/Makefile              | 2 +-
+ lib/eldap/src/Makefile             | 4 ----
+ lib/erl_docgen/src/Makefile        | 2 --
+ lib/et/src/Makefile                | 1 -
+ lib/eunit/src/Makefile             | 2 --
+ lib/gs/src/Makefile                | 4 ++--
+ lib/hipe/cerl/Makefile             | 2 +-
+ lib/hipe/flow/Makefile             | 2 +-
+ lib/hipe/icode/Makefile            | 2 +-
+ lib/hipe/main/Makefile             | 2 +-
+ lib/hipe/misc/Makefile             | 2 +-
+ lib/hipe/rtl/Makefile              | 2 +-
+ lib/hipe/util/Makefile             | 3 +--
+ lib/ic/src/Makefile                | 2 +-
+ lib/inets/src/ftp/Makefile         | 2 +-
+ lib/inets/src/http_client/Makefile | 2 +-
+ lib/inets/src/http_lib/Makefile    | 2 +-
+ lib/inets/src/http_server/Makefile | 2 +-
+ lib/inets/src/inets_app/Makefile   | 2 +-
+ lib/inets/src/tftp/Makefile        | 2 +-
+ lib/inviso/src/Makefile            | 2 --
+ lib/kernel/src/Makefile            | 1 -
+ lib/megaco/src/app/Makefile        | 2 +-
+ lib/megaco/src/binary/Makefile     | 2 +-
+ lib/megaco/src/engine/Makefile     | 2 +-
+ lib/megaco/src/flex/Makefile.in    | 2 +-
+ lib/megaco/src/tcp/Makefile        | 2 +-
+ lib/megaco/src/text/Makefile       | 2 +-
+ lib/megaco/src/udp/Makefile        | 2 +-
+ lib/mnesia/src/Makefile            | 2 +-
+ lib/observer/src/Makefile          | 1 -
+ lib/odbc/src/Makefile              | 2 +-
+ lib/orber/COSS/CosNaming/Makefile  | 2 +-
+ lib/orber/src/Makefile             | 2 +-
+ lib/os_mon/src/Makefile            | 1 -
+ lib/otp_mibs/src/Makefile          | 2 --
+ lib/parsetools/src/Makefile        | 2 --
+ lib/percept/src/Makefile           | 2 --
+ lib/pman/src/Makefile              | 2 +-
+ lib/public_key/src/Makefile        | 4 ----
+ lib/reltool/src/Makefile           | 2 +-
+ lib/runtime_tools/src/Makefile     | 2 --
+ lib/sasl/src/Makefile              | 2 +-
+ lib/snmp/src/agent/Makefile        | 2 +-
+ lib/snmp/src/app/Makefile          | 2 +-
+ lib/snmp/src/compile/Makefile      | 2 +-
+ lib/snmp/src/manager/Makefile      | 2 +-
+ lib/snmp/src/misc/Makefile         | 2 +-
+ lib/ssh/src/Makefile               | 2 +-
+ lib/ssl/src/Makefile               | 2 +-
+ lib/stdlib/src/Makefile            | 1 -
+ lib/syntax_tools/src/Makefile      | 2 --
+ lib/test_server/src/Makefile       | 1 -
+ lib/toolbar/src/Makefile           | 2 +-
+ lib/tools/src/Makefile             | 2 +-
+ lib/tv/src/Makefile                | 2 +-
+ lib/typer/src/Makefile             | 3 ---
+ lib/webtool/src/Makefile           | 2 --
+ lib/wx/src/Makefile                | 4 ++--
+ lib/xmerl/src/Makefile             | 4 +---
+ 76 files changed, 60 insertions(+), 110 deletions(-)
 
 diff --git a/erts/preloaded/src/Makefile b/erts/preloaded/src/Makefile
-index 1456388..81db627 100644
+index 5bcc2eb..c87dc9e 100644
 --- a/erts/preloaded/src/Makefile
 +++ b/erts/preloaded/src/Makefile
 @@ -68,8 +68,6 @@ copy:
  include $(ERL_TOP)/make/otp_release_targets.mk
  
  release_spec: 
--	$(INSTALL_DIR) $(RELSYSDIR)/src
--	$(INSTALL_DATA) $(ERL_FILES) $(RELSYSDIR)/src
- 	$(INSTALL_DIR) $(RELSYSDIR)/ebin
- 	$(INSTALL_DATA) $(STATIC_TARGET_FILES) $(RELSYSDIR)/ebin
+-	$(INSTALL_DIR) "$(RELSYSDIR)/src"
+-	$(INSTALL_DATA) $(ERL_FILES) "$(RELSYSDIR)/src"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DATA) $(STATIC_TARGET_FILES) "$(RELSYSDIR)/ebin"
  
 diff --git a/lib/appmon/src/Makefile b/lib/appmon/src/Makefile
-index 43f4f08..7e2d9b1 100644
+index 06e61b7..cae409b 100644
 --- a/lib/appmon/src/Makefile
 +++ b/lib/appmon/src/Makefile
 @@ -93,7 +93,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
  
  release_spec: opt
- 	$(INSTALL_DIR) $(RELSYSDIR)/src
--	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(RELSYSDIR)/src
-+	$(INSTALL_DATA) $(HRL_FILES) $(RELSYSDIR)/src
- 	$(INSTALL_DIR) $(RELSYSDIR)/ebin
- 	$(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
+-	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) "$(RELSYSDIR)/src"
++	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
  
 diff --git a/lib/asn1/src/Makefile b/lib/asn1/src/Makefile
-index 5614cbe..1857cbf 100644
+index 4bd49aa..b6d4880 100644
 --- a/lib/asn1/src/Makefile
 +++ b/lib/asn1/src/Makefile
 @@ -156,7 +156,7 @@ release_spec: opt
- 	$(INSTALL_DIR) $(RELSYSDIR)/ebin
- 	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) $(RELSYSDIR)/ebin
- 	$(INSTALL_DIR) $(RELSYSDIR)/src
--	$(INSTALL_DATA)  $(ERL_FILES) $(HRL_FILES) $(APP_SRC) $(APPUP_SRC) $(RELSYSDIR)/src
-+	$(INSTALL_DATA) $(HRL_FILES) $(RELSYSDIR)/src
- 	$(INSTALL_DIR) $(RELSYSDIR)/examples
- 	$(INSTALL_DATA) $(EXAMPLES) $(RELSYSDIR)/examples
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
+-	$(INSTALL_DATA)  $(ERL_FILES) $(HRL_FILES) $(APP_SRC) $(APPUP_SRC) "$(RELSYSDIR)/src"
++	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/examples"
+ 	$(INSTALL_DATA) $(EXAMPLES) "$(RELSYSDIR)/examples"
  
 diff --git a/lib/common_test/src/Makefile b/lib/common_test/src/Makefile
-index 6a16c6f..7547e47 100644
+index f7dce19..ee75f6e 100644
 --- a/lib/common_test/src/Makefile
 +++ b/lib/common_test/src/Makefile
-@@ -134,7 +134,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
+@@ -138,7 +138,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
  
  release_spec: opt
- 	$(INSTALL_DIR) $(RELSYSDIR)/src
--	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(RELSYSDIR)/src
-+	$(INSTALL_DATA) $(HRL_FILES) $(RELSYSDIR)/src
- 	$(INSTALL_DIR) $(RELSYSDIR)/ebin
- 	$(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
- 	$(INSTALL_DIR) $(RELSYSDIR)/include
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
+-	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) "$(RELSYSDIR)/src"
++	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/include"
 diff --git a/lib/compiler/src/Makefile b/lib/compiler/src/Makefile
-index 3415517..9aea1f3 100644
+index 958d350..312ddfa 100644
 --- a/lib/compiler/src/Makefile
 +++ b/lib/compiler/src/Makefile
 @@ -164,8 +164,8 @@ include $(ERL_TOP)/make/otp_release_targets.mk
  
  release_spec: opt
- 	$(INSTALL_DIR) $(RELSYSDIR)/src
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
 -	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(EXTRA_FILES) \
--		$(YRL_FILE) $(RELSYSDIR)/src
+-		$(YRL_FILE) "$(RELSYSDIR)/src"
 +	$(INSTALL_DATA) $(HRL_FILES) $(EXTRA_FILES) \
-+		$(RELSYSDIR)/src
- 	$(INSTALL_DIR) $(RELSYSDIR)/ebin
- 	$(INSTALL_DATA) $(INSTALL_FILES) $(RELSYSDIR)/ebin
++		"$(RELSYSDIR)/src"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DATA) $(INSTALL_FILES) "$(RELSYSDIR)/ebin"
  
 diff --git a/lib/cosEvent/src/Makefile b/lib/cosEvent/src/Makefile
-index f8e751f..369ad08 100644
+index 7787fad..0bf29fb 100644
 --- a/lib/cosEvent/src/Makefile
 +++ b/lib/cosEvent/src/Makefile
 @@ -202,7 +202,7 @@ release_spec: opt
- 	$(INSTALL_DIR) $(RELSYSDIR)/ebin
- 	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) $(RELSYSDIR)/ebin
- 	$(INSTALL_DIR) $(RELSYSDIR)/src
--	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(GEN_ERL_FILES) $(IDL_FILES) $(RELSYSDIR)/src
-+	$(INSTALL_DATA) $(HRL_FILES) $(IDL_FILES) $(RELSYSDIR)/src
- 	$(INSTALL_DIR) $(RELSYSDIR)/include
- 	$(INSTALL_DATA) $(GEN_HRL_FILES) $(RELSYSDIR)/include
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
+-	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(GEN_ERL_FILES) $(IDL_FILES) "$(RELSYSDIR)/src"
++	$(INSTALL_DATA) $(HRL_FILES) $(IDL_FILES) "$(RELSYSDIR)/src"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/include"
+ 	$(INSTALL_DATA) $(GEN_HRL_FILES) "$(RELSYSDIR)/include"
  
 diff --git a/lib/cosEventDomain/src/Makefile b/lib/cosEventDomain/src/Makefile
-index 409cac4..722ec46 100644
+index 213d433..f1efdac 100644
 --- a/lib/cosEventDomain/src/Makefile
 +++ b/lib/cosEventDomain/src/Makefile
 @@ -171,7 +171,7 @@ release_spec: opt
- 	$(INSTALL_DIR) $(RELSYSDIR)/ebin
- 	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) $(RELSYSDIR)/ebin
- 	$(INSTALL_DIR) $(RELSYSDIR)/src
--	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(GEN_ERL_FILES) $(IDL_FILES) $(RELSYSDIR)/src
-+	$(INSTALL_DATA) $(HRL_FILES) $(IDL_FILES) $(RELSYSDIR)/src
- 	$(INSTALL_DIR) $(RELSYSDIR)/include
- 	$(INSTALL_DATA) $(EXTERNAL_GEN_HRL_FILES) $(RELSYSDIR)/include
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
+-	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(GEN_ERL_FILES) $(IDL_FILES) "$(RELSYSDIR)/src"
++	$(INSTALL_DATA) $(HRL_FILES) $(IDL_FILES) "$(RELSYSDIR)/src"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/include"
+ 	$(INSTALL_DATA) $(EXTERNAL_GEN_HRL_FILES) "$(RELSYSDIR)/include"
  
 diff --git a/lib/cosFileTransfer/src/Makefile b/lib/cosFileTransfer/src/Makefile
-index 1d51304..c5cb87a 100644
+index d552349..6aa53b7 100644
 --- a/lib/cosFileTransfer/src/Makefile
 +++ b/lib/cosFileTransfer/src/Makefile
-@@ -179,8 +179,7 @@ release_spec: opt
- 	$(INSTALL_DIR) $(RELSYSDIR)/ebin
- 	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) $(RELSYSDIR)/ebin
- 	$(INSTALL_DIR) $(RELSYSDIR)/src
--	$(INSTALL_DATA) $(GEN_FILES) $(IDL_FILES) $(RELSYSDIR)/src
--	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(GEN_ERL_FILES) $(IDL_FILES) $(RELSYSDIR)/src
-+	$(INSTALL_DATA) $(HRL_FILES) $(GEN_HRL_FILES) $(IDL_FILES) $(RELSYSDIR)/src
- 	$(INSTALL_DIR) $(RELSYSDIR)/include
- 	$(INSTALL_DATA) $(GEN_HRL_FILES) $(RELSYSDIR)/include
+@@ -179,9 +179,7 @@ release_spec: opt
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
+-	$(INSTALL_DATA) $(GEN_FILES) $(IDL_FILES) "$(RELSYSDIR)/src"
+-	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(GEN_ERL_FILES) $(IDL_FILES) "$(RELSYSDIR)/src"
++	$(INSTALL_DATA) $(HRL_FILES) $(GEN_HRL_FILES) $(IDL_FILES) "$(RELSYSDIR)/src"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/include"
+-	$(INSTALL_DATA) $(GEN_HRL_FILES) "$(RELSYSDIR)/include"
  
+ release_docs_spec:
 diff --git a/lib/cosNotification/src/Makefile b/lib/cosNotification/src/Makefile
-index 92225c6..4568cd7 100644
+index decf598..3c3423f 100644
 --- a/lib/cosNotification/src/Makefile
 +++ b/lib/cosNotification/src/Makefile
 @@ -370,8 +370,7 @@ release_spec: opt
- 	$(INSTALL_DIR) $(RELSYSDIR)/ebin
- 	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) $(RELSYSDIR)/ebin
- 	$(INSTALL_DIR) $(RELSYSDIR)/src
--	$(INSTALL_DATA) $(GEN_FILES) $(IDL_FILES) $(YECC_FILES) $(RELSYSDIR)/src
--	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(IDL_FILES) $(YECC_FILES) $(RELSYSDIR)/src
-+	$(INSTALL_DATA) $(GEN_HRL_FILES) $(HRL_FILES) $(IDL_FILES) $(RELSYSDIR)/src
- 	$(INSTALL_DIR) $(RELSYSDIR)/include
- 	$(INSTALL_DATA) $(GEN_HRL_FILES) $(RELSYSDIR)/include
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
+-	$(INSTALL_DATA) $(GEN_FILES) $(IDL_FILES) $(YECC_FILES) "$(RELSYSDIR)/src"
+-	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(IDL_FILES) $(YECC_FILES) "$(RELSYSDIR)/src"
++	$(INSTALL_DATA) $(GEN_HRL_FILES) $(HRL_FILES) $(IDL_FILES) "$(RELSYSDIR)/src"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/include"
+ 	$(INSTALL_DATA) $(GEN_HRL_FILES) "$(RELSYSDIR)/include"
  
 diff --git a/lib/cosProperty/src/Makefile b/lib/cosProperty/src/Makefile
-index 8060421..2a83d28 100644
+index 54d1b60..25d3d43 100644
 --- a/lib/cosProperty/src/Makefile
 +++ b/lib/cosProperty/src/Makefile
 @@ -179,8 +179,7 @@ release_spec: opt
- 	$(INSTALL_DIR) $(RELSYSDIR)/ebin
- 	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) $(RELSYSDIR)/ebin
- 	$(INSTALL_DIR) $(RELSYSDIR)/src
--	$(INSTALL_DATA) $(GEN_FILES) $(IDL_FILES) $(RELSYSDIR)/src
--	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(GEN_ERL_FILES) $(IDL_FILES) $(RELSYSDIR)/src
-+	$(INSTALL_DATA) $(GEN_HRL_FILES) $(HRL_FILES) $(IDL_FILES) $(RELSYSDIR)/src
- 	$(INSTALL_DIR) $(RELSYSDIR)/include
- 	$(INSTALL_DATA) $(GEN_HRL_FILES) $(RELSYSDIR)/include
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
+-	$(INSTALL_DATA) $(GEN_FILES) $(IDL_FILES) "$(RELSYSDIR)/src"
+-	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(GEN_ERL_FILES) $(IDL_FILES) "$(RELSYSDIR)/src"
++	$(INSTALL_DATA) $(GEN_HRL_FILES) $(HRL_FILES) $(IDL_FILES) "$(RELSYSDIR)/src"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/include"
+ 	$(INSTALL_DATA) $(GEN_HRL_FILES) "$(RELSYSDIR)/include"
  
 diff --git a/lib/cosTime/src/Makefile b/lib/cosTime/src/Makefile
-index 18c25ca..c3df6a0 100644
+index e8536a3..3872160 100644
 --- a/lib/cosTime/src/Makefile
 +++ b/lib/cosTime/src/Makefile
 @@ -198,8 +198,7 @@ release_spec: opt
- 	$(INSTALL_DIR) $(RELSYSDIR)/ebin
- 	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) $(RELSYSDIR)/ebin
- 	$(INSTALL_DIR) $(RELSYSDIR)/src
--	$(INSTALL_DATA) $(GEN_FILES) $(IDL_FILES) $(RELSYSDIR)/src
--	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(GEN_ERL_FILES) $(IDL_FILES) $(RELSYSDIR)/src
-+	$(INSTALL_DATA) $(GEN_HRL_FILES) $(HRL_FILES) $(IDL_FILES) $(RELSYSDIR)/src
- 	$(INSTALL_DIR) $(RELSYSDIR)/include
- 	$(INSTALL_DATA) $(GEN_HRL_FILES) $(RELSYSDIR)/include
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
+-	$(INSTALL_DATA) $(GEN_FILES) $(IDL_FILES) "$(RELSYSDIR)/src"
+-	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(GEN_ERL_FILES) $(IDL_FILES) "$(RELSYSDIR)/src"
++	$(INSTALL_DATA) $(GEN_HRL_FILES) $(HRL_FILES) $(IDL_FILES) "$(RELSYSDIR)/src"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/include"
+ 	$(INSTALL_DATA) $(GEN_HRL_FILES) "$(RELSYSDIR)/include"
  
 diff --git a/lib/cosTransactions/src/Makefile b/lib/cosTransactions/src/Makefile
-index 3c799ca..3b35bac 100644
+index 1d935c4..0dd00c1 100644
 --- a/lib/cosTransactions/src/Makefile
 +++ b/lib/cosTransactions/src/Makefile
 @@ -173,7 +173,7 @@ release_spec: opt
- 	$(INSTALL_DIR) $(RELSYSDIR)/ebin
- 	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) $(RELSYSDIR)/ebin
- 	$(INSTALL_DIR) $(RELSYSDIR)/src
--	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(GEN_ERL_FILES) $(IDL_FILE) $(RELSYSDIR)/src
-+	$(INSTALL_DATA) $(HRL_FILES) $(IDL_FILE) $(RELSYSDIR)/src
- 	$(INSTALL_DIR) $(RELSYSDIR)/include
- 	$(INSTALL_DATA) $(EXTERNAL_GEN_HRL_FILES) $(RELSYSDIR)/include
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
+-	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(GEN_ERL_FILES) $(IDL_FILE) "$(RELSYSDIR)/src"
++	$(INSTALL_DATA) $(HRL_FILES) $(IDL_FILE) "$(RELSYSDIR)/src"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/include"
+ 	$(INSTALL_DATA) $(EXTERNAL_GEN_HRL_FILES) "$(RELSYSDIR)/include"
  
 diff --git a/lib/crypto/src/Makefile b/lib/crypto/src/Makefile
-index 0e886ce..d24ab24 100644
+index 910e893..2baf92d 100644
 --- a/lib/crypto/src/Makefile
 +++ b/lib/crypto/src/Makefile
 @@ -83,8 +83,6 @@ docs:
  include $(ERL_TOP)/make/otp_release_targets.mk
  
  release_spec: opt
--	$(INSTALL_DIR) $(RELSYSDIR)/src
--	$(INSTALL_DATA) $(ERL_FILES) $(RELSYSDIR)/src
- 	$(INSTALL_DIR) $(RELSYSDIR)/ebin
+-	$(INSTALL_DIR) "$(RELSYSDIR)/src"
+-	$(INSTALL_DATA) $(ERL_FILES) "$(RELSYSDIR)/src"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
  	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) \
- 		$(APPUP_TARGET) $(RELSYSDIR)/ebin
+ 		$(APPUP_TARGET) "$(RELSYSDIR)/ebin"
 diff --git a/lib/debugger/src/Makefile b/lib/debugger/src/Makefile
-index be9a2d1..073c3aa 100644
+index e8b350c..85da380 100644
 --- a/lib/debugger/src/Makefile
 +++ b/lib/debugger/src/Makefile
 @@ -130,7 +130,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
  
  release_spec: opt
- 	$(INSTALL_DIR) $(RELSYSDIR)/src
--	$(INSTALL_DATA) $(ERL_FILES) $(INTERNAL_HRL_FILES) $(TOOLBOX_FILES) $(RELSYSDIR)/src
-+	$(INSTALL_DATA) $(INTERNAL_HRL_FILES) $(TOOLBOX_FILES) $(RELSYSDIR)/src
- 	$(INSTALL_DIR) $(RELSYSDIR)/ebin
- 	$(INSTALL_DATA) $(TARGET_FILES) $(TARGET_TOOLBOX_FILES) $(RELSYSDIR)/ebin
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
+-	$(INSTALL_DATA) $(ERL_FILES) $(INTERNAL_HRL_FILES) $(TOOLBOX_FILES) "$(RELSYSDIR)/src"
++	$(INSTALL_DATA) $(INTERNAL_HRL_FILES) $(TOOLBOX_FILES) "$(RELSYSDIR)/src"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DATA) $(TARGET_FILES) $(TARGET_TOOLBOX_FILES) "$(RELSYSDIR)/ebin"
  
 diff --git a/lib/dialyzer/src/Makefile b/lib/dialyzer/src/Makefile
-index 04f3b84..083a568 100644
+index 63cc1c9..af956d9 100644
 --- a/lib/dialyzer/src/Makefile
 +++ b/lib/dialyzer/src/Makefile
-@@ -153,7 +153,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
+@@ -156,7 +156,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
  
  release_spec: opt
- 	$(INSTALL_DIR) $(RELSYSDIR)/src
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
 -	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(EXTRA_FILES) \
 +	$(INSTALL_DATA) $(HRL_FILES) $(EXTRA_FILES) \
- 		$(RELSYSDIR)/src
- 	$(INSTALL_DIR) $(RELSYSDIR)/ebin
- 	$(INSTALL_DATA) $(INSTALL_FILES) $(RELSYSDIR)/ebin
+ 		"$(RELSYSDIR)/src"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DATA) $(INSTALL_FILES) "$(RELSYSDIR)/ebin"
 diff --git a/lib/diameter/src/Makefile b/lib/diameter/src/Makefile
-index dbfaa4e..51db955 100644
+index 99c3432..d79b3af 100644
 --- a/lib/diameter/src/Makefile
 +++ b/lib/diameter/src/Makefile
-@@ -206,11 +206,8 @@ release_spec: opt
+@@ -231,11 +231,8 @@ release_spec: opt
  	$(MAKE) $(EXAMPLE_DIRS:%/=release_examples_%)
  
  $(TARGET_DIRS:%/=release_src_%): release_src_%:
--	$(INSTALL_DIR) $(RELSYSDIR)/src/$*
+-	$(INSTALL_DIR) "$(RELSYSDIR)/src/$*"
 -	$(INSTALL_DATA) $(filter $*/%, $(TARGET_MODULES:%=%.erl) \
 -	                               $(INTERNAL_HRLS)) \
 -	                $(filter $*/%, compiler/$(DICT_YRL).yrl) \
--	                $(RELSYSDIR)/src/$*
+-	                "$(RELSYSDIR)/src/$*"
 +	$(INSTALL_DATA) $(filter $*/%, $(INTERNAL_HRLS)) \
-+	                $(RELSYSDIR)/src/$* || true
++	                "$(RELSYSDIR)/src/$*" || true
  
  $(EXAMPLE_DIRS:%/=release_examples_%): release_examples_%:
- 	$(INSTALL_DIR) $(RELSYSDIR)/examples/$*
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/examples/$*"
 diff --git a/lib/edoc/src/Makefile b/lib/edoc/src/Makefile
-index fcb0b61..2082ca6 100644
+index 72354ac..f6ed199 100644
 --- a/lib/edoc/src/Makefile
 +++ b/lib/edoc/src/Makefile
 @@ -88,7 +88,7 @@ release_spec: opt
- 	$(INSTALL_DIR) $(RELSYSDIR)/ebin
- 	$(INSTALL_DATA) $(OBJECTS) $(RELSYSDIR)/ebin
- 	$(INSTALL_DIR) $(RELSYSDIR)/src
--	$(INSTALL_DATA) $(SOURCES) $(HRL_FILES) $(YRL_FILE) $(RELSYSDIR)/src
-+	$(INSTALL_DATA) $(HRL_FILES) $(RELSYSDIR)/src
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DATA) $(OBJECTS) "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
+-	$(INSTALL_DATA) $(SOURCES) $(HRL_FILES) $(YRL_FILE) "$(RELSYSDIR)/src"
++	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src"
  
  release_docs_spec:
  
 diff --git a/lib/eldap/src/Makefile b/lib/eldap/src/Makefile
-index 4ddb808..02072fa 100644
+index 39a41d0..30b0b17 100644
 --- a/lib/eldap/src/Makefile
 +++ b/lib/eldap/src/Makefile
 @@ -98,10 +98,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk
  release_spec: opt
- 	$(INSTALL_DIR) $(RELSYSDIR)/ebin
- 	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) $(RELSYSDIR)/ebin
--	$(INSTALL_DIR) $(RELSYSDIR)/src
--	$(INSTALL_DATA) $(ERL_FILES) $(RELSYSDIR)/src
--	$(INSTALL_DIR) $(RELSYSDIR)/asn1
--	$(INSTALL_DATA) ../asn1/$(ASN1_FILES) $(RELSYSDIR)/asn1
- 	$(INSTALL_DIR) $(RELSYSDIR)/include
- 	$(INSTALL_DATA) $(EXTERNAL_HRL_FILES) $(RELSYSDIR)/include
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin"
+-	$(INSTALL_DIR) "$(RELSYSDIR)/src"
+-	$(INSTALL_DATA) $(ERL_FILES) "$(RELSYSDIR)/src"
+-	$(INSTALL_DIR) "$(RELSYSDIR)/asn1"
+-	$(INSTALL_DATA) ../asn1/$(ASN1_FILES) "$(RELSYSDIR)/asn1"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/include"
+ 	$(INSTALL_DATA) $(EXTERNAL_HRL_FILES) "$(RELSYSDIR)/include"
  
 diff --git a/lib/erl_docgen/src/Makefile b/lib/erl_docgen/src/Makefile
-index cbaf6e4..d3cdbd6 100644
+index 6c8b438..5f918a9 100644
 --- a/lib/erl_docgen/src/Makefile
 +++ b/lib/erl_docgen/src/Makefile
 @@ -89,8 +89,6 @@ $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk
  include $(ERL_TOP)/make/otp_release_targets.mk
  
  release_spec: opt
--	$(INSTALL_DIR) $(RELSYSDIR)/src
--	$(INSTALL_DATA) $(ERL_FILES) $(RELSYSDIR)/src
- 	$(INSTALL_DIR) $(RELSYSDIR)/ebin
- 	$(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
+-	$(INSTALL_DIR) "$(RELSYSDIR)/src"
+-	$(INSTALL_DATA) $(ERL_FILES) "$(RELSYSDIR)/src"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
  
 diff --git a/lib/et/src/Makefile b/lib/et/src/Makefile
-index bb6632e..3e71e02 100644
+index c68a3f4..4d8e93f 100644
 --- a/lib/et/src/Makefile
 +++ b/lib/et/src/Makefile
 @@ -108,7 +108,6 @@ release_spec: opt
- 	$(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
- 	$(INSTALL_DATA) $(APP_TARGET) $(APPUP_TARGET) $(RELSYSDIR)/ebin
- 	$(INSTALL_DIR)  $(RELSYSDIR)/src
--	$(INSTALL_DATA) $(ERL_FILES) $(RELSYSDIR)/src
- 	$(INSTALL_DATA) $(INTERNAL_HRL_FILES) $(RELSYSDIR)/src
- 	$(INSTALL_DIR)  $(RELSYSDIR)/include
- 	$(INSTALL_DATA) $(HRL_FILES) $(RELSYSDIR)/include
+ 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DATA) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DIR)  "$(RELSYSDIR)/src"
+-	$(INSTALL_DATA) $(ERL_FILES) "$(RELSYSDIR)/src"
+ 	$(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src"
+ 	$(INSTALL_DIR)  "$(RELSYSDIR)/include"
+ 	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include"
 diff --git a/lib/eunit/src/Makefile b/lib/eunit/src/Makefile
-index bec2fdb..0814f12 100644
+index 0a2e71c..18db0f4 100644
 --- a/lib/eunit/src/Makefile
 +++ b/lib/eunit/src/Makefile
-@@ -109,8 +109,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk
+@@ -117,8 +117,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk
  release_spec: opt
- 	$(INSTALL_DIR) $(RELSYSDIR)/ebin
- 	$(INSTALL_DATA) $(PARSE_TRANSFORM_BIN) $(OBJECTS) $(RELSYSDIR)/ebin
--	$(INSTALL_DIR) $(RELSYSDIR)/src
--	$(INSTALL_DATA) $(PARSE_TRANSFORM) $(SOURCES) $(RELSYSDIR)/src
- 	$(INSTALL_DIR) $(RELSYSDIR)/include
- 	$(INSTALL_DATA) $(INCLUDE_DELIVERABLES) $(RELSYSDIR)/include
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DATA) $(PARSE_TRANSFORM_BIN) $(OBJECTS) "$(RELSYSDIR)/ebin"
+-	$(INSTALL_DIR) "$(RELSYSDIR)/src"
+-	$(INSTALL_DATA) $(PARSE_TRANSFORM) $(SOURCES) "$(RELSYSDIR)/src"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/include"
+ 	$(INSTALL_DATA) $(INCLUDE_DELIVERABLES) "$(RELSYSDIR)/include"
  
 diff --git a/lib/gs/src/Makefile b/lib/gs/src/Makefile
-index 43b5302..37e836a 100644
+index 4b7a452..ada9464 100644
 --- a/lib/gs/src/Makefile
 +++ b/lib/gs/src/Makefile
 @@ -108,8 +108,8 @@ include $(ERL_TOP)/make/otp_release_targets.mk
  
  release_spec: opt
- 	$(INSTALL_DIR) $(RELSYSDIR)/src
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
 -	$(INSTALL_DATA) $(APP_SRC) $(ERL_FILES) $(HRL_FILES) $(GEN_HRL_FILES) \
--		$(GSTK_GENERIC) $(RELSYSDIR)/src
+-		$(GSTK_GENERIC) "$(RELSYSDIR)/src"
 +	$(INSTALL_DATA) $(HRL_FILES) $(GEN_HRL_FILES) \
-+		$(RELSYSDIR)/src
- 	$(INSTALL_DIR) $(RELSYSDIR)/ebin
- 	$(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
- 	$(INSTALL_DIR) $(RELSYSDIR)/priv/bitmap
++		"$(RELSYSDIR)/src"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/priv/bitmap"
 diff --git a/lib/hipe/cerl/Makefile b/lib/hipe/cerl/Makefile
-index 14e68f5..2828bc7 100644
+index 506e993..d74b75c 100644
 --- a/lib/hipe/cerl/Makefile
 +++ b/lib/hipe/cerl/Makefile
 @@ -101,7 +101,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
  
  release_spec: opt
- 	$(INSTALL_DIR) $(RELSYSDIR)/cerl
--	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(RELSYSDIR)/cerl
-+	$(INSTALL_DATA) $(HRL_FILES) $(RELSYSDIR)/cerl
- 	$(INSTALL_DIR) $(RELSYSDIR)/ebin
- 	$(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/cerl"
+-	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) "$(RELSYSDIR)/cerl"
++	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/cerl"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
  
 diff --git a/lib/hipe/flow/Makefile b/lib/hipe/flow/Makefile
-index 1a531fd..9f1a098 100644
+index 75e156b..5e394ca 100644
 --- a/lib/hipe/flow/Makefile
 +++ b/lib/hipe/flow/Makefile
 @@ -101,7 +101,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
  
  release_spec: opt
- 	$(INSTALL_DIR) $(RELSYSDIR)/flow
--	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(INC_FILES) $(RELSYSDIR)/flow
-+	$(INSTALL_DATA) $(HRL_FILES) $(INC_FILES) $(RELSYSDIR)/flow
- 	$(INSTALL_DIR) $(RELSYSDIR)/ebin
- 	$(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/flow"
+-	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(INC_FILES) "$(RELSYSDIR)/flow"
++	$(INSTALL_DATA) $(HRL_FILES) $(INC_FILES) "$(RELSYSDIR)/flow"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
  
 diff --git a/lib/hipe/icode/Makefile b/lib/hipe/icode/Makefile
-index 0d940d4..54c4263 100644
+index 0f2d6db..4e267f9 100644
 --- a/lib/hipe/icode/Makefile
 +++ b/lib/hipe/icode/Makefile
 @@ -119,7 +119,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
  
  release_spec: opt
- 	$(INSTALL_DIR) $(RELSYSDIR)/icode
--	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(RELSYSDIR)/icode
-+	$(INSTALL_DATA) $(HRL_FILES) $(RELSYSDIR)/icode
- 	$(INSTALL_DIR) $(RELSYSDIR)/ebin
- 	$(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/icode"
+-	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) "$(RELSYSDIR)/icode"
++	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/icode"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
  
 diff --git a/lib/hipe/main/Makefile b/lib/hipe/main/Makefile
-index fc8923d..5b94d90 100644
+index 673431a..c372a37 100644
 --- a/lib/hipe/main/Makefile
 +++ b/lib/hipe/main/Makefile
 @@ -117,7 +117,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
  release_spec: opt
- 	$(INSTALL_DATA) ../vsn.mk $(RELSYSDIR)
- 	$(INSTALL_DIR) $(RELSYSDIR)/main
--	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(RELSYSDIR)/main
-+	$(INSTALL_DATA) $(HRL_FILES) $(RELSYSDIR)/main
- 	$(INSTALL_DIR) $(RELSYSDIR)/ebin
- 	$(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
+ 	$(INSTALL_DATA) ../vsn.mk "$(RELSYSDIR)"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/main"
+-	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) "$(RELSYSDIR)/main"
++	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/main"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
  
 diff --git a/lib/hipe/misc/Makefile b/lib/hipe/misc/Makefile
-index 98a69d6..23073cd 100644
+index 16166f5..0ba5845 100644
 --- a/lib/hipe/misc/Makefile
 +++ b/lib/hipe/misc/Makefile
 @@ -101,7 +101,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
  
  release_spec: opt
- 	$(INSTALL_DIR) $(RELSYSDIR)/misc
--	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(RELSYSDIR)/misc
-+	$(INSTALL_DATA) $(HRL_FILES) $(RELSYSDIR)/misc
- 	$(INSTALL_DIR) $(RELSYSDIR)/ebin
- 	$(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/misc"
+-	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) "$(RELSYSDIR)/misc"
++	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/misc"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
  
 diff --git a/lib/hipe/rtl/Makefile b/lib/hipe/rtl/Makefile
-index 3002683..40efb6f 100644
+index 426d1bd..44238b9 100644
 --- a/lib/hipe/rtl/Makefile
 +++ b/lib/hipe/rtl/Makefile
 @@ -104,7 +104,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
  
  release_spec: opt
- 	$(INSTALL_DIR) $(RELSYSDIR)/rtl
--	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(RELSYSDIR)/rtl
-+	$(INSTALL_DATA) $(HRL_FILES) $(RELSYSDIR)/rtl
- 	$(INSTALL_DIR) $(RELSYSDIR)/ebin
- 	$(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/rtl"
+-	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) "$(RELSYSDIR)/rtl"
++	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/rtl"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
  
 diff --git a/lib/hipe/util/Makefile b/lib/hipe/util/Makefile
-index 2f17eee..083933b 100644
+index a5ee232..e46ece0 100644
 --- a/lib/hipe/util/Makefile
 +++ b/lib/hipe/util/Makefile
 @@ -49,7 +49,6 @@ HIPE_MODULES =
@@ -475,353 +476,352 @@ index 2f17eee..083933b 100644
  ERL_FILES= $(MODULES:%=%.erl)
  TARGET_FILES= $(MODULES:%=$(EBIN)/%.$(EMULATOR))
  DOC_FILES= $(MODULES:%=$(DOCS)/%.html)
-@@ -103,8 +102,6 @@ $(DOCS)/%.html:%.erl
- include $(ERL_TOP)/make/otp_release_targets.mk
+@@ -104,7 +103,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
  
  release_spec: opt
--	$(INSTALL_DIR) $(RELSYSDIR)/util
--	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(RELSYSDIR)/util
- 	$(INSTALL_DIR) $(RELSYSDIR)/ebin
- 	$(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/util"
+-	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) "$(RELSYSDIR)/util"
++	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/util"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
  
 diff --git a/lib/ic/src/Makefile b/lib/ic/src/Makefile
-index 5dac304..381cafe 100644
+index 280d86a..3cd19f4 100644
 --- a/lib/ic/src/Makefile
 +++ b/lib/ic/src/Makefile
 @@ -199,7 +199,7 @@ release_spec: opt
- 	$(INSTALL_DIR) $(RELSYSDIR)/ebin
- 	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(RELSYSDIR)/ebin
- 	$(INSTALL_DIR) $(RELSYSDIR)/src
--	$(INSTALL_DATA) $(ERL_FILES) $(YRL_FILE) $(INTERNAL_HRL_FILES) $(RELSYSDIR)/src
-+	$(INSTALL_DATA) $(INTERNAL_HRL_FILES) $(RELSYSDIR)/src
- 	$(INSTALL_DIR) $(RELSYSDIR)/examples
- 	$(INSTALL_DIR) $(RELSYSDIR)/examples/c-client
- 	$(INSTALL_DATA) $(CCL_EX_FILES) $(RELSYSDIR)/examples/c-client	
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
+-	$(INSTALL_DATA) $(ERL_FILES) $(YRL_FILE) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src"
++	$(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/examples"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/examples/c-client"
+ 	$(INSTALL_DATA) $(CCL_EX_FILES) "$(RELSYSDIR)/examples/c-client"
 diff --git a/lib/inets/src/ftp/Makefile b/lib/inets/src/ftp/Makefile
-index 19b9387..f3ff8bf 100644
+index 2c3d2b6..de0450e 100644
 --- a/lib/inets/src/ftp/Makefile
 +++ b/lib/inets/src/ftp/Makefile
 @@ -90,7 +90,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
  release_spec: opt
- 	$(INSTALL_DIR)  $(RELSYSDIR)/src
- 	$(INSTALL_DIR)  $(RELSYSDIR)/src/ftp
--	$(INSTALL_DATA) $(HRL_FILES) $(ERL_FILES) $(RELSYSDIR)/src/ftp
-+	$(INSTALL_DATA) $(HRL_FILES) $(RELSYSDIR)/src/ftp
- 	$(INSTALL_DIR)  $(RELSYSDIR)/ebin
- 	$(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
+ 	$(INSTALL_DIR)  "$(RELSYSDIR)/src"
+ 	$(INSTALL_DIR)  "$(RELSYSDIR)/src/ftp"
+-	$(INSTALL_DATA) $(HRL_FILES) $(ERL_FILES) "$(RELSYSDIR)/src/ftp"
++	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src/ftp"
+ 	$(INSTALL_DIR)  "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
  
 diff --git a/lib/inets/src/http_client/Makefile b/lib/inets/src/http_client/Makefile
-index d490e59..961324e 100644
+index f0d4ce1..35c4ffc 100644
 --- a/lib/inets/src/http_client/Makefile
 +++ b/lib/inets/src/http_client/Makefile
 @@ -91,7 +91,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
  release_spec: opt
- 	$(INSTALL_DIR)  $(RELSYSDIR)/src
- 	$(INSTALL_DIR)  $(RELSYSDIR)/src/http_client
--	$(INSTALL_DATA) $(HRL_FILES) $(ERL_FILES) $(RELSYSDIR)/src/http_client
-+	$(INSTALL_DATA) $(HRL_FILES) $(RELSYSDIR)/src/http_client
- 	$(INSTALL_DIR)  $(RELSYSDIR)/ebin
- 	$(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
+ 	$(INSTALL_DIR)  "$(RELSYSDIR)/src"
+ 	$(INSTALL_DIR)  "$(RELSYSDIR)/src/http_client"
+-	$(INSTALL_DATA) $(HRL_FILES) $(ERL_FILES) "$(RELSYSDIR)/src/http_client"
++	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src/http_client"
+ 	$(INSTALL_DIR)  "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
  
 diff --git a/lib/inets/src/http_lib/Makefile b/lib/inets/src/http_lib/Makefile
-index aaf3cfb..0236a49 100644
+index 51167b3..a623824 100644
 --- a/lib/inets/src/http_lib/Makefile
 +++ b/lib/inets/src/http_lib/Makefile
 @@ -89,7 +89,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
  release_spec: opt
- 	$(INSTALL_DIR)  $(RELSYSDIR)/src
- 	$(INSTALL_DIR)  $(RELSYSDIR)/src/http_lib
--	$(INSTALL_DATA) $(HRL_FILES) $(ERL_FILES) $(RELSYSDIR)/src/http_lib
-+	$(INSTALL_DATA) $(HRL_FILES) $(RELSYSDIR)/src/http_lib
- 	$(INSTALL_DIR)  $(RELSYSDIR)/ebin
- 	$(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
+ 	$(INSTALL_DIR)  "$(RELSYSDIR)/src"
+ 	$(INSTALL_DIR)  "$(RELSYSDIR)/src/http_lib"
+-	$(INSTALL_DATA) $(HRL_FILES) $(ERL_FILES) "$(RELSYSDIR)/src/http_lib"
++	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src/http_lib"
+ 	$(INSTALL_DIR)  "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
  
 diff --git a/lib/inets/src/http_server/Makefile b/lib/inets/src/http_server/Makefile
-index 60bb0d2..bfc2986 100644
+index 67555d5..0620f3a 100644
 --- a/lib/inets/src/http_server/Makefile
 +++ b/lib/inets/src/http_server/Makefile
 @@ -125,7 +125,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
  release_spec: opt
- 	$(INSTALL_DIR)  $(RELSYSDIR)/src
- 	$(INSTALL_DIR)  $(RELSYSDIR)/src/http_server
--	$(INSTALL_DATA) $(HRL_FILES) $(ERL_FILES) $(RELSYSDIR)/src/http_server
-+	$(INSTALL_DATA) $(HRL_FILES) $(RELSYSDIR)/src/http_server
- 	$(INSTALL_DIR)  $(RELSYSDIR)/ebin
- 	$(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
+ 	$(INSTALL_DIR)  "$(RELSYSDIR)/src"
+ 	$(INSTALL_DIR)  "$(RELSYSDIR)/src/http_server"
+-	$(INSTALL_DATA) $(HRL_FILES) $(ERL_FILES) "$(RELSYSDIR)/src/http_server"
++	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src/http_server"
+ 	$(INSTALL_DIR)  "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
  
 diff --git a/lib/inets/src/inets_app/Makefile b/lib/inets/src/inets_app/Makefile
-index 6da6a1d..5e9951a 100644
+index 7d68145..71885ef 100644
 --- a/lib/inets/src/inets_app/Makefile
 +++ b/lib/inets/src/inets_app/Makefile
 @@ -113,7 +113,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
  release_spec: opt
- 	$(INSTALL_DIR)  $(RELSYSDIR)/src
- 	$(INSTALL_DIR)  $(RELSYSDIR)/src/inets_app
--	$(INSTALL_DATA) $(INTERNAL_HRL_FILES) $(ERL_FILES) $(RELSYSDIR)/src/inets_app
-+	$(INSTALL_DATA) $(INTERNAL_HRL_FILES) $(RELSYSDIR)/src/inets_app
- 	$(INSTALL_DIR)  $(RELSYSDIR)/include
- 	$(INSTALL_DATA) $(EXTERNAL_HRL_FILES) $(RELSYSDIR)/include
- 	$(INSTALL_DIR)  $(RELSYSDIR)/ebin
+ 	$(INSTALL_DIR)  "$(RELSYSDIR)/src"
+ 	$(INSTALL_DIR)  "$(RELSYSDIR)/src/inets_app"
+-	$(INSTALL_DATA) $(INTERNAL_HRL_FILES) $(ERL_FILES) "$(RELSYSDIR)/src/inets_app"
++	$(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src/inets_app"
+ 	$(INSTALL_DIR)  "$(RELSYSDIR)/include"
+ 	$(INSTALL_DATA) $(EXTERNAL_HRL_FILES) "$(RELSYSDIR)/include"
+ 	$(INSTALL_DIR)  "$(RELSYSDIR)/ebin"
 diff --git a/lib/inets/src/tftp/Makefile b/lib/inets/src/tftp/Makefile
-index 759b70c..9e4f769 100644
+index b368b12..5eddaf0 100644
 --- a/lib/inets/src/tftp/Makefile
 +++ b/lib/inets/src/tftp/Makefile
-@@ -88,7 +88,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
+@@ -95,7 +95,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
  release_spec: opt
- 	$(INSTALL_DIR)  $(RELSYSDIR)/src
- 	$(INSTALL_DIR)  $(RELSYSDIR)/src/tftp
--	$(INSTALL_DATA) $(HRL_FILES) $(ERL_FILES) $(RELSYSDIR)/src/tftp
-+	$(INSTALL_DATA) $(HRL_FILES) $(RELSYSDIR)/src/tftp
- 	$(INSTALL_DIR)  $(RELSYSDIR)/ebin
- 	$(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
+ 	$(INSTALL_DIR)  "$(RELSYSDIR)/src"
+ 	$(INSTALL_DIR)  "$(RELSYSDIR)/src/tftp"
+-	$(INSTALL_DATA) $(HRL_FILES) $(ERL_FILES) "$(RELSYSDIR)/src/tftp"
++	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src/tftp"
+ 	$(INSTALL_DIR)  "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DATA) $(TARGET_FILES) $(BEHAVIOUR_TARGET_FILES) "$(RELSYSDIR)/ebin"
  
 diff --git a/lib/inviso/src/Makefile b/lib/inviso/src/Makefile
-index 1f2f8b1..9f7652d 100644
+index 292a2be..b1c9a1f 100644
 --- a/lib/inviso/src/Makefile
 +++ b/lib/inviso/src/Makefile
 @@ -87,8 +87,6 @@ docs:
  include $(ERL_TOP)/make/otp_release_targets.mk
  
  release_spec: opt
--	$(INSTALL_DIR) $(RELSYSDIR)/src
--	$(INSTALL_DATA) $(ERL_FILES) $(RELSYSDIR)/src
- #	$(INSTALL_DIR) $(RELSYSDIR)/include
- #	$(INSTALL_DATA) $(HRL_FILES) $(RELSYSDIR)/include
- 	$(INSTALL_DIR) $(RELSYSDIR)/ebin
+-	$(INSTALL_DIR) "$(RELSYSDIR)/src"
+-	$(INSTALL_DATA) $(ERL_FILES) "$(RELSYSDIR)/src"
+ #	$(INSTALL_DIR) "$(RELSYSDIR)/include"
+ #	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
 diff --git a/lib/kernel/src/Makefile b/lib/kernel/src/Makefile
-index 54f21eb..9b6e3eb 100644
+index c76ff9e..7706204 100644
 --- a/lib/kernel/src/Makefile
 +++ b/lib/kernel/src/Makefile
 @@ -199,7 +199,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk
  
  release_spec: opt
- 	$(INSTALL_DIR) $(RELSYSDIR)/src
--	$(INSTALL_DATA) $(ERL_FILES) $(RELSYSDIR)/src
- 	$(INSTALL_DATA) $(INTERNAL_HRL_FILES) $(RELSYSDIR)/src
- 	$(INSTALL_DIR) $(RELSYSDIR)/include
- 	$(INSTALL_DATA) $(HRL_FILES) $(RELSYSDIR)/include
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
+-	$(INSTALL_DATA) $(ERL_FILES) "$(RELSYSDIR)/src"
+ 	$(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/include"
+ 	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include"
 diff --git a/lib/megaco/src/app/Makefile b/lib/megaco/src/app/Makefile
-index 01dfb9b..c6a631d 100644
+index 42030c5..282419f 100644
 --- a/lib/megaco/src/app/Makefile
 +++ b/lib/megaco/src/app/Makefile
 @@ -113,7 +113,7 @@ release_spec: opt
- 	$(INSTALL_DATA) $(APP_TARGET) $(APPUP_TARGET) $(RELSYSDIR)/ebin
- 	$(INSTALL_DIR)  $(RELSYSDIR)/src
- 	$(INSTALL_DIR)  $(RELSYSDIR)/src/app
--	$(INSTALL_DATA) $(ERL_FILES) $(INTERNAL_HRL_FILES) $(RELSYSDIR)/src/app
-+	$(INSTALL_DATA) $(INTERNAL_HRL_FILES) $(RELSYSDIR)/src/app
- 	$(INSTALL_DIR)  $(RELSYSDIR)/include
- 	$(INSTALL_DATA) $(EXTERNAL_HRL_FILES) $(RELSYSDIR)/include
+ 	$(INSTALL_DATA) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DIR)  "$(RELSYSDIR)/src"
+ 	$(INSTALL_DIR)  "$(RELSYSDIR)/src/app"
+-	$(INSTALL_DATA) $(ERL_FILES) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src/app"
++	$(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src/app"
+ 	$(INSTALL_DIR)  "$(RELSYSDIR)/include"
+ 	$(INSTALL_DATA) $(EXTERNAL_HRL_FILES) "$(RELSYSDIR)/include"
  
 diff --git a/lib/megaco/src/binary/Makefile b/lib/megaco/src/binary/Makefile
-index d594f34..6614599 100644
+index 695599b..187ccac 100644
 --- a/lib/megaco/src/binary/Makefile
 +++ b/lib/megaco/src/binary/Makefile
 @@ -198,7 +198,7 @@ release_spec: opt
- 	$(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
- 	$(INSTALL_DIR)  $(RELSYSDIR)/src
- 	$(INSTALL_DIR)  $(RELSYSDIR)/src/binary
--	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(ASN1_FILES) $(RELSYSDIR)/src/binary
-+	$(INSTALL_DATA) $(HRL_FILES) $(RELSYSDIR)/src/binary
+ 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DIR)  "$(RELSYSDIR)/src"
+ 	$(INSTALL_DIR)  "$(RELSYSDIR)/src/binary"
+-	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(ASN1_FILES) "$(RELSYSDIR)/src/binary"
++	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src/binary"
  
  
  release_docs_spec:
 diff --git a/lib/megaco/src/engine/Makefile b/lib/megaco/src/engine/Makefile
-index 3943f4b..879abff 100644
+index 7cecef1..841a88a 100644
 --- a/lib/megaco/src/engine/Makefile
 +++ b/lib/megaco/src/engine/Makefile
-@@ -92,7 +92,7 @@ release_spec: opt
- 	$(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
- 	$(INSTALL_DIR)  $(RELSYSDIR)/src
- 	$(INSTALL_DIR)  $(RELSYSDIR)/src/engine
--	$(INSTALL_DATA) $(ERL_FILES) $(INTERNAL_HRL_FILES) $(RELSYSDIR)/src/engine
-+	$(INSTALL_DATA) $(INTERNAL_HRL_FILES) $(RELSYSDIR)/src/engine
- 	$(INSTALL_DIR)  $(RELSYSDIR)/include
+@@ -101,7 +101,7 @@ release_spec: opt
+ 	$(INSTALL_DATA) $(BEHAVIOUR_TARGET_FILES) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DIR)  "$(RELSYSDIR)/src"
+ 	$(INSTALL_DIR)  "$(RELSYSDIR)/src/engine"
+-	$(INSTALL_DATA) $(ERL_FILES) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src/engine"
++	$(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src/engine"
+ 	$(INSTALL_DIR)  "$(RELSYSDIR)/include"
  
  
 diff --git a/lib/megaco/src/flex/Makefile.in b/lib/megaco/src/flex/Makefile.in
-index 27275f2..a45b7c3 100644
+index b36ef26..5b5042d 100644
 --- a/lib/megaco/src/flex/Makefile.in
 +++ b/lib/megaco/src/flex/Makefile.in
-@@ -276,7 +276,6 @@ release_spec: opt
- 	$(INSTALL_DIR)  $(RELSYSDIR)/src/flex
- 	$(INSTALL_DIR)  $(RELSYSDIR)/priv/lib
- 	$(INSTALL_DIR)  $(RELSYSDIR)/include
--	$(INSTALL_DATA) $(ERL_FILES) $(INTERNAL_HRL_FILES) $(RELSYSDIR)/src/flex
- 	$(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
+@@ -276,7 +276,7 @@ release_spec: opt
+ 	$(INSTALL_DIR)  "$(RELSYSDIR)/src/flex"
+ 	$(INSTALL_DIR)  "$(RELSYSDIR)/priv/lib"
+ 	$(INSTALL_DIR)  "$(RELSYSDIR)/include"
+-	$(INSTALL_DATA) $(ERL_FILES) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src/flex"
++	$(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src/flex"
+ 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
  ifeq ($(ENABLE_MEGACO_FLEX_SCANNER),true)
- 	$(INSTALL_DATA) $(FLEX_FILES) $(RELSYSDIR)/src/flex
+ 	$(INSTALL_DATA) $(FLEX_FILES) "$(RELSYSDIR)/src/flex"
 diff --git a/lib/megaco/src/tcp/Makefile b/lib/megaco/src/tcp/Makefile
-index 0bd4b7c..8675d1b 100644
+index 0c30aba..aa553ff 100644
 --- a/lib/megaco/src/tcp/Makefile
 +++ b/lib/megaco/src/tcp/Makefile
 @@ -93,7 +93,7 @@ release_spec: opt
- 	$(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
- 	$(INSTALL_DIR)  $(RELSYSDIR)/src
- 	$(INSTALL_DIR)  $(RELSYSDIR)/src/tcp
--	$(INSTALL_DATA) $(ERL_FILES) $(INTERNAL_HRL_FILES) $(RELSYSDIR)/src/tcp
-+	$(INSTALL_DATA) $(INTERNAL_HRL_FILES) $(RELSYSDIR)/src/tcp
+ 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DIR)  "$(RELSYSDIR)/src"
+ 	$(INSTALL_DIR)  "$(RELSYSDIR)/src/tcp"
+-	$(INSTALL_DATA) $(ERL_FILES) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src/tcp"
++	$(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src/tcp"
  
  
  release_docs_spec:
 diff --git a/lib/megaco/src/text/Makefile b/lib/megaco/src/text/Makefile
-index b2e8e76..bdb9c00 100644
+index cab4256..d5cf217 100644
 --- a/lib/megaco/src/text/Makefile
 +++ b/lib/megaco/src/text/Makefile
 @@ -134,7 +134,7 @@ release_spec: opt
- 	$(INSTALL_DATA) $(BEAM_TARGET_FILES) $(RELSYSDIR)/ebin
- 	$(INSTALL_DIR)  $(RELSYSDIR)/src
- 	$(INSTALL_DIR)  $(RELSYSDIR)/src/text
--	$(INSTALL_DATA) $(ERL_FILES) $(INTERNAL_YRL_FILES) $(INTERNAL_HRL_FILES) $(RELSYSDIR)/src/text
-+	$(INSTALL_DATA) $(INTERNAL_HRL_FILES) $(RELSYSDIR)/src/text
+ 	$(INSTALL_DATA) $(BEAM_TARGET_FILES) "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DIR)  "$(RELSYSDIR)/src"
+ 	$(INSTALL_DIR)  "$(RELSYSDIR)/src/text"
+-	$(INSTALL_DATA) $(ERL_FILES) $(INTERNAL_YRL_FILES) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src/text"
++	$(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src/text"
  
  
  release_docs_spec:
 diff --git a/lib/megaco/src/udp/Makefile b/lib/megaco/src/udp/Makefile
-index 64b6478..5cf0fe2 100644
+index 9486804..ea4830c 100644
 --- a/lib/megaco/src/udp/Makefile
 +++ b/lib/megaco/src/udp/Makefile
 @@ -93,7 +93,7 @@ release_spec: opt
- 	$(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
- 	$(INSTALL_DIR)  $(RELSYSDIR)/src
- 	$(INSTALL_DIR)  $(RELSYSDIR)/src/udp
--	$(INSTALL_DATA) $(ERL_FILES) $(INTERNAL_HRL_FILES) $(RELSYSDIR)/src/udp
-+	$(INSTALL_DATA) $(INTERNAL_HRL_FILES) $(RELSYSDIR)/src/udp
+ 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DIR)  "$(RELSYSDIR)/src"
+ 	$(INSTALL_DIR)  "$(RELSYSDIR)/src/udp"
+-	$(INSTALL_DATA) $(ERL_FILES) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src/udp"
++	$(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src/udp"
  
  
  release_docs_spec:
 diff --git a/lib/mnesia/src/Makefile b/lib/mnesia/src/Makefile
-index 1c8ec54..cc00b60 100644
+index 6f28943..ead350f 100644
 --- a/lib/mnesia/src/Makefile
 +++ b/lib/mnesia/src/Makefile
 @@ -133,7 +133,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
  
  release_spec: opt
- 	$(INSTALL_DIR) $(RELSYSDIR)/src
--	$(INSTALL_DATA) $(HRL_FILES) $(ERL_FILES) $(RELSYSDIR)/src
-+	$(INSTALL_DATA) $(HRL_FILES) $(RELSYSDIR)/src
- 	$(INSTALL_DIR) $(RELSYSDIR)/ebin
- 	$(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
+-	$(INSTALL_DATA) $(HRL_FILES) $(ERL_FILES) "$(RELSYSDIR)/src"
++	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
  
 diff --git a/lib/observer/src/Makefile b/lib/observer/src/Makefile
-index 91a4c65..b14dc4b 100644
+index 7135a6a..c8e78e6 100644
 --- a/lib/observer/src/Makefile
 +++ b/lib/observer/src/Makefile
 @@ -130,7 +130,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk
  
  release_spec: opt
- 	$(INSTALL_DIR) $(RELSYSDIR)/src
--	$(INSTALL_DATA) $(ERL_FILES) $(RELSYSDIR)/src
- 	$(INSTALL_DATA) $(INTERNAL_HRL_FILES) $(RELSYSDIR)/src
- 	$(INSTALL_DIR) $(RELSYSDIR)/examples
- 	$(INSTALL_DATA) $(EXAMPLE_FILES) $(RELSYSDIR)/examples
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
+-	$(INSTALL_DATA) $(ERL_FILES) "$(RELSYSDIR)/src"
+ 	$(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/examples"
+ 	$(INSTALL_DATA) $(EXAMPLE_FILES) "$(RELSYSDIR)/examples"
 diff --git a/lib/odbc/src/Makefile b/lib/odbc/src/Makefile
-index b48dd76..deb9947 100644
+index 2af65cc..2358d16 100644
 --- a/lib/odbc/src/Makefile
 +++ b/lib/odbc/src/Makefile
 @@ -109,7 +109,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
  
  release_spec: opt
- 	$(INSTALL_DIR) $(RELSYSDIR)/src
--	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(RELSYSDIR)/src
-+	$(INSTALL_DATA) $(HRL_FILES) $(RELSYSDIR)/src
- 	$(INSTALL_DIR) $(RELSYSDIR)/include
- 	$(INSTALL_DATA) $(EXT_HRL_FILES) $(RELSYSDIR)/include 
- 	$(INSTALL_DIR) $(RELSYSDIR)/ebin	
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
+-	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) "$(RELSYSDIR)/src"
++	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/include"
+ 	$(INSTALL_DATA) $(EXT_HRL_FILES) "$(RELSYSDIR)/include"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
 diff --git a/lib/orber/COSS/CosNaming/Makefile b/lib/orber/COSS/CosNaming/Makefile
-index 064447f..b464b55 100644
+index 769c08a..9906247 100644
 --- a/lib/orber/COSS/CosNaming/Makefile
 +++ b/lib/orber/COSS/CosNaming/Makefile
-@@ -144,8 +144,8 @@ release_spec: opt
- 	$(INSTALL_DIR) $(RELSYSDIR)/ebin
- 	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(RELSYSDIR)/ebin
- 	$(INSTALL_DIR) $(RELSYSDIR)/COSS/CosNaming
--	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(IDL_FILE) $(RELSYSDIR)/COSS/CosNaming
--	$(INSTALL_DATA) $(GEN_FILES) $(RELSYSDIR)/COSS/CosNaming
-+	$(INSTALL_DATA) $(HRL_FILES) $(IDL_FILE) $(RELSYSDIR)/COSS/CosNaming
-+	$(INSTALL_DATA) $(GEN_HRL_FILES) $(GEN_EXT_HRL_FILES) $(RELSYSDIR)/COSS/CosNaming
+@@ -144,7 +144,7 @@ release_spec: opt
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/COSS/CosNaming"
+-	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(IDL_FILE) "$(RELSYSDIR)/COSS/CosNaming"
++	$(INSTALL_DATA) $(HRL_FILES) $(IDL_FILE) "$(RELSYSDIR)/COSS/CosNaming"
+ 	$(INSTALL_DATA) $(GEN_FILES) "$(RELSYSDIR)/COSS/CosNaming"
  
  
- release_docs_spec:
 diff --git a/lib/orber/src/Makefile b/lib/orber/src/Makefile
-index d2e9868..5ff5803 100644
+index 72610de..a800d2f 100644
 --- a/lib/orber/src/Makefile
 +++ b/lib/orber/src/Makefile
 @@ -257,7 +257,7 @@ release_spec: opt
- 	$(INSTALL_DIR) $(RELSYSDIR)/ebin
- 	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) $(RELSYSDIR)/ebin
- 	$(INSTALL_DIR) $(RELSYSDIR)/src
--	$(INSTALL_DATA) $(ERL_FILES) $(YRL_FILE) $(GEN_HRL_FILES_LOC) $(INTERNAL_HRL_FILES) $(RELSYSDIR)/src
-+	$(INSTALL_DATA) $(GEN_HRL_FILES_LOC) $(INTERNAL_HRL_FILES) $(RELSYSDIR)/src
- 	$(INSTALL_DIR) $(RELSYSDIR)/include
- 	$(INSTALL_DATA) $(EXTERNAL_HRL_FILES) $(GEN_HRL_FILES_EXT) $(RELSYSDIR)/include
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
+-	$(INSTALL_DATA) $(ERL_FILES) $(YRL_FILE) $(GEN_HRL_FILES_LOC) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src"
++	$(INSTALL_DATA) $(GEN_HRL_FILES_LOC) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/include"
+ 	$(INSTALL_DATA) $(EXTERNAL_HRL_FILES) $(GEN_HRL_FILES_EXT) "$(RELSYSDIR)/include"
  
 diff --git a/lib/os_mon/src/Makefile b/lib/os_mon/src/Makefile
-index a492a63..77e7a06 100644
+index 79a4076..1197250 100644
 --- a/lib/os_mon/src/Makefile
 +++ b/lib/os_mon/src/Makefile
 @@ -104,7 +104,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk
  
  release_spec: opt
- 	$(INSTALL_DIR) $(RELSYSDIR)/src
--	$(INSTALL_DATA) $(ERL_FILES) $(RELSYSDIR)/src
- 	$(INSTALL_DATA) $(HRL_FILES) $(RELSYSDIR)/src
- 	$(INSTALL_DIR) $(RELSYSDIR)/ebin
- 	$(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
+-	$(INSTALL_DATA) $(ERL_FILES) "$(RELSYSDIR)/src"
+ 	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
 diff --git a/lib/otp_mibs/src/Makefile b/lib/otp_mibs/src/Makefile
-index 833a439..257e294 100644
+index 03298d3..83b2e05 100644
 --- a/lib/otp_mibs/src/Makefile
 +++ b/lib/otp_mibs/src/Makefile
 @@ -95,8 +95,6 @@ $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk
  include $(ERL_TOP)/make/otp_release_targets.mk
  
  release_spec: opt
--	$(INSTALL_DIR) $(RELSYSDIR)/src
--	$(INSTALL_DATA) $(ERL_FILES) $(RELSYSDIR)/src
- 	$(INSTALL_DIR) $(RELSYSDIR)/ebin
- 	$(INSTALL_DATA) $(TARGETS) $(RELSYSDIR)/ebin
+-	$(INSTALL_DIR) "$(RELSYSDIR)/src"
+-	$(INSTALL_DATA) $(ERL_FILES) "$(RELSYSDIR)/src"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DATA) $(TARGETS) "$(RELSYSDIR)/ebin"
  
 diff --git a/lib/parsetools/src/Makefile b/lib/parsetools/src/Makefile
-index 89e079e..1093f4f 100644
+index 4f199da..bffd62f 100644
 --- a/lib/parsetools/src/Makefile
 +++ b/lib/parsetools/src/Makefile
 @@ -89,8 +89,6 @@ $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk
  include $(ERL_TOP)/make/otp_release_targets.mk
  
  release_spec: opt
--	$(INSTALL_DIR) $(RELSYSDIR)/src
--	$(INSTALL_DATA) $(ERL_FILES) $(RELSYSDIR)/src
- 	$(INSTALL_DIR) $(RELSYSDIR)/ebin
- 	$(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
- 	$(INSTALL_DIR) $(RELSYSDIR)/include
+-	$(INSTALL_DIR) "$(RELSYSDIR)/src"
+-	$(INSTALL_DATA) $(ERL_FILES) "$(RELSYSDIR)/src"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/include"
 diff --git a/lib/percept/src/Makefile b/lib/percept/src/Makefile
-index 5dfc725..a8a1718 100644
+index 253a8c2..6720c05 100644
 --- a/lib/percept/src/Makefile
 +++ b/lib/percept/src/Makefile
 @@ -93,8 +93,6 @@ docs:
  include $(ERL_TOP)/make/otp_release_targets.mk
  
  release_spec: opt
--	$(INSTALL_DIR) $(RELSYSDIR)/src
--	$(INSTALL_DATA) $(ERL_FILES) $(RELSYSDIR)/src
- #	$(INSTALL_DIR) $(RELSYSDIR)/include
- #	$(INSTALL_DATA) $(HRL_FILES) $(RELSYSDIR)/include
- 	$(INSTALL_DIR) $(RELSYSDIR)/ebin
+-	$(INSTALL_DIR) "$(RELSYSDIR)/src"
+-	$(INSTALL_DATA) $(ERL_FILES) "$(RELSYSDIR)/src"
+ #	$(INSTALL_DIR) "$(RELSYSDIR)/include"
+ #	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
 diff --git a/lib/pman/src/Makefile b/lib/pman/src/Makefile
-index e573e57..bdbced1 100644
+index fa01fe7..5197f4b 100644
 --- a/lib/pman/src/Makefile
 +++ b/lib/pman/src/Makefile
 @@ -104,7 +104,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
  
  release_spec: opt
- 	$(INSTALL_DIR) $(RELSYSDIR)/src
--	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(TOOLBOX_FILES) $(RELSYSDIR)/src
-+	$(INSTALL_DATA) $(HRL_FILES) $(TOOLBOX_FILES) $(RELSYSDIR)/src
- 	$(INSTALL_DIR) $(RELSYSDIR)/ebin
- 	$(INSTALL_DATA) $(TARGET_FILES) $(TARGET_TOOLBOX_FILES) $(RELSYSDIR)/ebin
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
+-	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(TOOLBOX_FILES) "$(RELSYSDIR)/src"
++	$(INSTALL_DATA) $(HRL_FILES) $(TOOLBOX_FILES) "$(RELSYSDIR)/src"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DATA) $(TARGET_FILES) $(TARGET_TOOLBOX_FILES) "$(RELSYSDIR)/ebin"
  
 diff --git a/lib/public_key/src/Makefile b/lib/public_key/src/Makefile
-index 062c495..954bf7c 100644
+index d5cd13d..d2a35f8 100644
 --- a/lib/public_key/src/Makefile
 +++ b/lib/public_key/src/Makefile
 @@ -48,8 +48,6 @@ MODULES = \
@@ -837,270 +837,272 @@ index 062c495..954bf7c 100644
  include $(ERL_TOP)/make/otp_release_targets.mk
  
  release_spec: opt
--	$(INSTALL_DIR) $(RELSYSDIR)/src
--	$(INSTALL_DATA) $(INTERNAL_HRL_FILES) $(ERL_FILES) $(RELSYSDIR)/src
- 	$(INSTALL_DIR) $(RELSYSDIR)/include
- 	$(INSTALL_DATA) $(HRL_FILES) $(RELSYSDIR)/include
- 	$(INSTALL_DIR) $(RELSYSDIR)/ebin
+-	$(INSTALL_DIR) "$(RELSYSDIR)/src"
+-	$(INSTALL_DATA) $(INTERNAL_HRL_FILES) $(ERL_FILES) "$(RELSYSDIR)/src"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/include"
+ 	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
 diff --git a/lib/reltool/src/Makefile b/lib/reltool/src/Makefile
-index 4e6a112..cef22b5 100644
+index a7e3405..3705dd9 100644
 --- a/lib/reltool/src/Makefile
 +++ b/lib/reltool/src/Makefile
 @@ -98,7 +98,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
  
  release_spec: opt
- 	$(INSTALL_DIR) $(RELSYSDIR)/src
--	$(INSTALL_DATA) $(INTERNAL_HRL_FILES) $(ERL_FILES) $(RELSYSDIR)/src
-+	$(INSTALL_DATA) $(INTERNAL_HRL_FILES) $(RELSYSDIR)/src
- 	$(INSTALL_DIR) $(RELSYSDIR)/ebin
- 	$(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
- 	$(INSTALL_DATA) $(APP_TARGET) $(APPUP_TARGET) $(RELSYSDIR)/ebin
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
+-	$(INSTALL_DATA) $(INTERNAL_HRL_FILES) $(ERL_FILES) "$(RELSYSDIR)/src"
++	$(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DATA) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin"
 diff --git a/lib/runtime_tools/src/Makefile b/lib/runtime_tools/src/Makefile
-index cb302b7..0cd12ba 100644
+index 810e3e8..b529c92 100644
 --- a/lib/runtime_tools/src/Makefile
 +++ b/lib/runtime_tools/src/Makefile
 @@ -99,8 +99,6 @@ docs:
  include $(ERL_TOP)/make/otp_release_targets.mk
  
  release_spec: opt
--	$(INSTALL_DIR) $(RELSYSDIR)/src
--	$(INSTALL_DATA) $(ERL_FILES) $(RELSYSDIR)/src
- 	$(INSTALL_DIR) $(RELSYSDIR)/include
- 	$(INSTALL_DATA) $(HRL_FILES) $(RELSYSDIR)/include
- 	$(INSTALL_DIR) $(RELSYSDIR)/examples
+-	$(INSTALL_DIR) "$(RELSYSDIR)/src"
+-	$(INSTALL_DATA) $(ERL_FILES) "$(RELSYSDIR)/src"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/include"
+ 	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/examples"
 diff --git a/lib/sasl/src/Makefile b/lib/sasl/src/Makefile
-index 9a5d1e4..4dd511f 100644
+index de0c45e..1f8bd28 100644
 --- a/lib/sasl/src/Makefile
 +++ b/lib/sasl/src/Makefile
-@@ -92,7 +92,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk
+@@ -92,7 +92,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
  
  release_spec: opt
- 	$(INSTALL_DIR) $(RELSYSDIR)/src
--	$(INSTALL_DATA) $(ERL_FILES) $(RELSYSDIR)/src
- 	$(INSTALL_DATA) $(INTERNAL_HRL_FILES) $(RELSYSDIR)/src
- 	$(INSTALL_DIR) $(RELSYSDIR)/ebin
- 	$(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
+-	$(INSTALL_DATA) $(ERL_FILES) "$(RELSYSDIR)/src"
++	$(INSTALL_DATA) "$(RELSYSDIR)/src"
+ 	$(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
 diff --git a/lib/snmp/src/agent/Makefile b/lib/snmp/src/agent/Makefile
-index a67fe4d..012e8be 100644
+index beed696..752072d 100644
 --- a/lib/snmp/src/agent/Makefile
 +++ b/lib/snmp/src/agent/Makefile
 @@ -130,7 +130,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
  release_spec: opt
- 	$(INSTALL_DIR) $(RELSYSDIR)/src
- 	$(INSTALL_DIR) $(RELSYSDIR)/src/agent
--	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(RELSYSDIR)/src/agent
-+	$(INSTALL_DATA) $(HRL_FILES) $(RELSYSDIR)/src/agent
- 	$(INSTALL_DIR) $(RELSYSDIR)/ebin
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/src/agent"
+-	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) "$(RELSYSDIR)/src/agent"
++	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src/agent"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
  	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) \
- 		$(RELSYSDIR)/ebin
+ 		"$(RELSYSDIR)/ebin"
 diff --git a/lib/snmp/src/app/Makefile b/lib/snmp/src/app/Makefile
-index d89eb4e..2adf916 100644
+index f7c311b..59d68b8 100644
 --- a/lib/snmp/src/app/Makefile
 +++ b/lib/snmp/src/app/Makefile
 @@ -129,7 +129,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
  release_spec: opt
- 	$(INSTALL_DIR) $(RELSYSDIR)/src
- 	$(INSTALL_DIR) $(RELSYSDIR)/src/app
--	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(RELSYSDIR)/src/app
-+	$(INSTALL_DATA) $(HRL_FILES) $(RELSYSDIR)/src/app
- 	$(INSTALL_DIR) $(RELSYSDIR)/ebin
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/src/app"
+-	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) "$(RELSYSDIR)/src/app"
++	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src/app"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
  	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) \
- 		$(RELSYSDIR)/ebin
+ 		"$(RELSYSDIR)/ebin"
 diff --git a/lib/snmp/src/compile/Makefile b/lib/snmp/src/compile/Makefile
-index 627af6f..af185bf 100644
+index f63fc18..9759451 100644
 --- a/lib/snmp/src/compile/Makefile
 +++ b/lib/snmp/src/compile/Makefile
 @@ -122,7 +122,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
  release_spec: opt
- 	$(INSTALL_DIR) $(RELSYSDIR)/src
- 	$(INSTALL_DIR) $(RELSYSDIR)/src/compiler
--	$(INSTALL_DATA) $(ESCRIPT_SRC) $(PARSER_SRC) $(ERL_FILES) $(INTERNAL_HRL_FILES) $(RELSYSDIR)/src/compiler
-+	$(INSTALL_DATA) $(INTERNAL_HRL_FILES) $(RELSYSDIR)/src/compiler
- 	$(INSTALL_DIR) $(RELSYSDIR)/ebin
- 	$(INSTALL_DATA) $(EBIN_FILES) $(RELSYSDIR)/ebin
- 	$(INSTALL_DIR) $(RELSYSDIR)/bin
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/src/compiler"
+-	$(INSTALL_DATA) $(ESCRIPT_SRC) $(PARSER_SRC) $(ERL_FILES) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src/compiler"
++	$(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src/compiler"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DATA) $(EBIN_FILES) "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/bin"
 diff --git a/lib/snmp/src/manager/Makefile b/lib/snmp/src/manager/Makefile
-index c1d5703..568530d 100644
+index c76dbac..548823a 100644
 --- a/lib/snmp/src/manager/Makefile
 +++ b/lib/snmp/src/manager/Makefile
 @@ -113,7 +113,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
  release_spec: opt
- 	$(INSTALL_DIR) $(RELSYSDIR)/src
- 	$(INSTALL_DIR) $(RELSYSDIR)/src/manager
--	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(RELSYSDIR)/src/manager
-+	$(INSTALL_DATA) $(HRL_FILES) $(RELSYSDIR)/src/manager
- 	$(INSTALL_DIR) $(RELSYSDIR)/ebin
- 	$(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
- # 	$(INSTALL_DIR) $(RELSYSDIR)/include
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/src/manager"
+-	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) "$(RELSYSDIR)/src/manager"
++	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src/manager"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
+ # 	$(INSTALL_DIR) "$(RELSYSDIR)/include"
 diff --git a/lib/snmp/src/misc/Makefile b/lib/snmp/src/misc/Makefile
-index 48d76bd..9f1f868 100644
+index 698c341..3344a0c 100644
 --- a/lib/snmp/src/misc/Makefile
 +++ b/lib/snmp/src/misc/Makefile
 @@ -111,7 +111,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
  release_spec: opt
- 	$(INSTALL_DIR) $(RELSYSDIR)/src
- 	$(INSTALL_DIR) $(RELSYSDIR)/src/misc
--	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(RELSYSDIR)/src/misc
-+	$(INSTALL_DATA) $(HRL_FILES) $(RELSYSDIR)/src/misc
- 	$(INSTALL_DIR) $(RELSYSDIR)/ebin
- 	$(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
- # 	$(INSTALL_DIR) $(RELSYSDIR)/include
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/src/misc"
+-	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) "$(RELSYSDIR)/src/misc"
++	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src/misc"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
+ # 	$(INSTALL_DIR) "$(RELSYSDIR)/include"
 diff --git a/lib/ssh/src/Makefile b/lib/ssh/src/Makefile
-index 1734ae4..99eb3a4 100644
+index b8eecd3..41bf50c 100644
 --- a/lib/ssh/src/Makefile
 +++ b/lib/ssh/src/Makefile
-@@ -128,7 +128,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
+@@ -133,7 +133,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
  
  release_spec: opt
- 	$(INSTALL_DIR) $(RELSYSDIR)/src
--	$(INSTALL_DATA) $(INTERNAL_HRL_FILES) $(ERL_FILES) $(RELSYSDIR)/src
-+	$(INSTALL_DATA) $(INTERNAL_HRL_FILES) $(RELSYSDIR)/src
- 	$(INSTALL_DIR) $(RELSYSDIR)/ebin
- 	$(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
- 	$(INSTALL_DIR) $(RELSYSDIR)/include
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
+-	$(INSTALL_DATA) $(INTERNAL_HRL_FILES) $(ERL_FILES) "$(RELSYSDIR)/src"
++	$(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DATA) $(BEHAVIOUR_TARGET_FILES) $(TARGET_FILES) $(APP_TARGET) \
+ 	$(APPUP_TARGET) "$(RELSYSDIR)/ebin"
 diff --git a/lib/ssl/src/Makefile b/lib/ssl/src/Makefile
-index dc69b53..63ac81e 100644
+index c5c5bf5..a7ac1aa 100644
 --- a/lib/ssl/src/Makefile
 +++ b/lib/ssl/src/Makefile
-@@ -112,7 +112,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
+@@ -123,7 +123,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
  
  release_spec: opt
- 	$(INSTALL_DIR) $(RELSYSDIR)/src
--	$(INSTALL_DATA) $(ERL_FILES) $(INTERNAL_HRL_FILES) $(RELSYSDIR)/src
-+	$(INSTALL_DATA) $(INTERNAL_HRL_FILES) $(RELSYSDIR)/src
- 	$(INSTALL_DIR) $(RELSYSDIR)/ebin
- 	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) \
- 	$(APPUP_TARGET) $(RELSYSDIR)/ebin
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
+-	$(INSTALL_DATA) $(ERL_FILES) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src"
++	$(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DATA) $(BEHAVIOUR_TARGET_FILES) $(TARGET_FILES) $(APP_TARGET) \
+ 	$(APPUP_TARGET) "$(RELSYSDIR)/ebin"
 diff --git a/lib/stdlib/src/Makefile b/lib/stdlib/src/Makefile
-index 90e239b..31cb268 100644
+index 1430482..d217c2d 100644
 --- a/lib/stdlib/src/Makefile
 +++ b/lib/stdlib/src/Makefile
-@@ -199,7 +199,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk
+@@ -200,7 +200,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk
  
  release_spec: opt
- 	$(INSTALL_DIR) $(RELSYSDIR)/src
--	$(INSTALL_DATA) $(ERL_FILES) erl_parse.yrl $(RELSYSDIR)/src
- 	$(INSTALL_DATA) $(INTERNAL_HRL_FILES) $(RELSYSDIR)/src
- 	$(INSTALL_DIR) $(RELSYSDIR)/include
- 	$(INSTALL_DATA) $(HRL_FILES) $(RELSYSDIR)/include
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
+-	$(INSTALL_DATA) $(ERL_FILES) erl_parse.yrl "$(RELSYSDIR)/src"
+ 	$(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/include"
+ 	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include"
 diff --git a/lib/syntax_tools/src/Makefile b/lib/syntax_tools/src/Makefile
-index bac138e..2cce48c 100644
+index dca5e78..6a65bfe 100644
 --- a/lib/syntax_tools/src/Makefile
 +++ b/lib/syntax_tools/src/Makefile
 @@ -82,8 +82,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk
  release_spec: opt
- 	$(INSTALL_DIR) $(RELSYSDIR)/ebin
- 	$(INSTALL_DATA) $(OBJECTS) $(RELSYSDIR)/ebin
--	$(INSTALL_DIR) $(RELSYSDIR)/src
--	$(INSTALL_DATA) $(SOURCES) $(RELSYSDIR)/src
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DATA) $(OBJECTS) "$(RELSYSDIR)/ebin"
+-	$(INSTALL_DIR) "$(RELSYSDIR)/src"
+-	$(INSTALL_DATA) $(SOURCES) "$(RELSYSDIR)/src"
  
  release_docs_spec:
  
 diff --git a/lib/test_server/src/Makefile b/lib/test_server/src/Makefile
-index 4bc5187..90419de 100644
+index 513720d..09766b1 100644
 --- a/lib/test_server/src/Makefile
 +++ b/lib/test_server/src/Makefile
 @@ -125,7 +125,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk
  
  release_spec: opt
- 	$(INSTALL_DIR) $(RELSYSDIR)/src
--	$(INSTALL_DATA) $(ERL_FILES) $(RELSYSDIR)/src
- 	$(INSTALL_DATA) $(INTERNAL_HRL_FILES) $(RELSYSDIR)/src
- 	$(INSTALL_DIR) $(RELSYSDIR)/include
- 	$(INSTALL_DATA) $(HRL_FILES) $(RELSYSDIR)/include
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
+-	$(INSTALL_DATA) $(ERL_FILES) "$(RELSYSDIR)/src"
+ 	$(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/include"
+ 	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include"
 diff --git a/lib/toolbar/src/Makefile b/lib/toolbar/src/Makefile
-index 14e1451..d71e18b 100644
+index 102970a..bdf63b5 100644
 --- a/lib/toolbar/src/Makefile
 +++ b/lib/toolbar/src/Makefile
 @@ -85,7 +85,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
  
  release_spec: opt
- 	$(INSTALL_DIR) $(RELSYSDIR)/src
--	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(RELSYSDIR)/src
-+	$(INSTALL_DATA) $(HRL_FILES) $(RELSYSDIR)/src
- 	$(INSTALL_DIR) $(RELSYSDIR)/ebin
- 	$(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
+-	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) "$(RELSYSDIR)/src"
++	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
  
 diff --git a/lib/tools/src/Makefile b/lib/tools/src/Makefile
-index 360f4f8..22deb2f 100644
+index abe1389..e5e4874 100644
 --- a/lib/tools/src/Makefile
 +++ b/lib/tools/src/Makefile
 @@ -106,7 +106,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
  
  release_spec: opt
- 	$(INSTALL_DIR) $(RELSYSDIR)/src
--	$(INSTALL_DATA) $(ERL_FILES) $(YRL_FILE) $(HRL_FILES) $(RELSYSDIR)/src
-+	$(INSTALL_DATA) $(HRL_FILES) $(RELSYSDIR)/src
- 	$(INSTALL_DIR) $(RELSYSDIR)/ebin
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
+-	$(INSTALL_DATA) $(ERL_FILES) $(YRL_FILE) $(HRL_FILES) "$(RELSYSDIR)/src"
++	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
  	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) \
- 		$(RELSYSDIR)/ebin
+ 		"$(RELSYSDIR)/ebin"
 diff --git a/lib/tv/src/Makefile b/lib/tv/src/Makefile
-index 457b9d3..1d2c97c 100644
+index da1713e..4436ac7 100644
 --- a/lib/tv/src/Makefile
 +++ b/lib/tv/src/Makefile
 @@ -127,7 +127,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
  
  release_spec: opt
- 	$(INSTALL_DIR) $(RELSYSDIR)/src
--	$(INSTALL_DATA) $(HRL_FILES) $(ERL_FILES) $(RELSYSDIR)/src
-+	$(INSTALL_DATA) $(HRL_FILES) $(RELSYSDIR)/src
- 	$(INSTALL_DIR) $(RELSYSDIR)/ebin
- 	$(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
+-	$(INSTALL_DATA) $(HRL_FILES) $(ERL_FILES) "$(RELSYSDIR)/src"
++	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
  
 diff --git a/lib/typer/src/Makefile b/lib/typer/src/Makefile
-index 620b3eb..67c266f 100644
+index 1f94d8f..751e76e 100644
 --- a/lib/typer/src/Makefile
 +++ b/lib/typer/src/Makefile
-@@ -102,8 +102,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk
+@@ -101,9 +101,6 @@ $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk
+ include $(ERL_TOP)/make/otp_release_targets.mk
  
  release_spec: opt
- 	$(INSTALL_DIR) $(RELSYSDIR)/src
+-	$(INSTALL_DIR) "$(RELSYSDIR)/src"
 -	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(YRL_FILES) \
--		$(RELSYSDIR)/src
- 	$(INSTALL_DIR) $(RELSYSDIR)/ebin
- 	$(INSTALL_DATA) $(INSTALL_FILES) $(RELSYSDIR)/ebin
+-		"$(RELSYSDIR)/src"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DATA) $(INSTALL_FILES) "$(RELSYSDIR)/ebin"
  
 diff --git a/lib/webtool/src/Makefile b/lib/webtool/src/Makefile
-index 62845cd..841cf11 100644
+index 783ffad..37135d3 100644
 --- a/lib/webtool/src/Makefile
 +++ b/lib/webtool/src/Makefile
 @@ -87,8 +87,6 @@ $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk
  include $(ERL_TOP)/make/otp_release_targets.mk
  
  release_spec: opt
--	$(INSTALL_DIR) $(RELSYSDIR)/src
--	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(RELSYSDIR)/src
- 	$(INSTALL_DIR) $(RELSYSDIR)/ebin
+-	$(INSTALL_DIR) "$(RELSYSDIR)/src"
+-	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) "$(RELSYSDIR)/src"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
  	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) \
- 		$(RELSYSDIR)/ebin
+ 		"$(RELSYSDIR)/ebin"
 diff --git a/lib/wx/src/Makefile b/lib/wx/src/Makefile
-index 16b425e..f42521a 100644
+index 777fb7d..f6a5a2a 100644
 --- a/lib/wx/src/Makefile
 +++ b/lib/wx/src/Makefile
 @@ -121,9 +121,9 @@ $(EBIN)/%.beam: $(EGEN)/%.erl $(HEADER_FILES)
  include $(ERL_TOP)/make/otp_release_targets.mk
  release_spec: opt 
- 	$(INSTALL_DIR) $(RELSYSDIR)/src
--	$(INSTALL_DATA) $(HRL_FILES) $(ERL_FILES) $(RELSYSDIR)/src
-+	$(INSTALL_DATA) $(HRL_FILES) $(RELSYSDIR)/src
- 	$(INSTALL_DIR) $(RELSYSDIR)/src/gen
--	$(INSTALL_DATA) $(GEN_HRL) $(GEN_FILES) $(RELSYSDIR)/src/gen
-+	$(INSTALL_DATA) $(GEN_HRL) $(RELSYSDIR)/src/gen
- 	$(INSTALL_DIR) $(RELSYSDIR)/include
- 	$(INSTALL_DATA) $(EXT_HRL) $(RELSYSDIR)/include
- 	$(INSTALL_DIR) $(RELSYSDIR)/ebin
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
+-	$(INSTALL_DATA) $(HRL_FILES) $(ERL_FILES) "$(RELSYSDIR)/src"
++	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/src/gen"
+-	$(INSTALL_DATA) $(GEN_HRL) $(GEN_FILES) "$(RELSYSDIR)/src/gen"
++	$(INSTALL_DATA) $(GEN_HRL) "$(RELSYSDIR)/src/gen"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/include"
+ 	$(INSTALL_DATA) $(EXT_HRL) "$(RELSYSDIR)/include"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
 diff --git a/lib/xmerl/src/Makefile b/lib/xmerl/src/Makefile
-index a5dbe45..52fe190 100644
+index ce1aa11..b381ce6 100644
 --- a/lib/xmerl/src/Makefile
 +++ b/lib/xmerl/src/Makefile
 @@ -217,9 +217,7 @@ release_spec: opt
- 	$(INSTALL_DIR) $(RELSYSDIR)/ebin
- 	$(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
- 	$(INSTALL_DIR) $(RELSYSDIR)/src
--	$(INSTALL_DATA) $(ERL_FILES) $(INTERNAL_HRL_FILES) $(APP_SRC) $(APPUP_SRC) $(RELSYSDIR)/src
--	$(INSTALL_DATA) xmerl_xpath_parse.yrl $(RELSYSDIR)/src
--	$(INSTALL_DATA) xmerl_b64Bin.yrl $(RELSYSDIR)/src
-+	$(INSTALL_DATA) $(INTERNAL_HRL_FILES) $(RELSYSDIR)/src
- 	$(INSTALL_DIR) $(RELSYSDIR)/include
- 	$(INSTALL_DATA) $(HRL_FILES) $(RELSYSDIR)/include
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
+-	$(INSTALL_DATA) $(ERL_FILES) $(INTERNAL_HRL_FILES) $(APP_SRC) $(APPUP_SRC) "$(RELSYSDIR)/src"
+-	$(INSTALL_DATA) xmerl_xpath_parse.yrl "$(RELSYSDIR)/src"
+-	$(INSTALL_DATA) xmerl_b64Bin.yrl "$(RELSYSDIR)/src"
++	$(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/include"
+ 	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include"
  
diff --git a/otp-0008-Ugly-workaround-for-java-1.5.0-gcj-which-doesn-t-sup.patch b/otp-0008-Ugly-workaround-for-java-1.5.0-gcj-which-doesn-t-sup.patch
index 1062a4c..0aa2e82 100644
--- a/otp-0008-Ugly-workaround-for-java-1.5.0-gcj-which-doesn-t-sup.patch
+++ b/otp-0008-Ugly-workaround-for-java-1.5.0-gcj-which-doesn-t-sup.patch
@@ -10,8 +10,8 @@ Fedora-Spec-Before: %ifnarch %{ix86} x86_64
 Fedora-Spec-After: %endif
 Fedora-Spec-After: %endif
 ---
- .../java_src/com/ericsson/otp/erlang/OtpErlangList.java  |   14 +-------------
- .../java_src/com/ericsson/otp/erlang/OtpInputStream.java |   13 ++-----------
+ .../java_src/com/ericsson/otp/erlang/OtpErlangList.java    | 14 +-------------
+ .../java_src/com/ericsson/otp/erlang/OtpInputStream.java   | 13 ++-----------
  2 files changed, 3 insertions(+), 24 deletions(-)
 
 diff --git a/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpErlangList.java b/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpErlangList.java
diff --git a/otp-0009-Restore-installation-of-a-n-internal-erl_interface-A.patch b/otp-0009-Restore-installation-of-a-n-internal-erl_interface-A.patch
index 12321ec..df98992 100644
--- a/otp-0009-Restore-installation-of-a-n-internal-erl_interface-A.patch
+++ b/otp-0009-Restore-installation-of-a-n-internal-erl_interface-A.patch
@@ -10,40 +10,44 @@ https://bugzilla.redhat.com/818419
 
 Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
 ---
- lib/erl_interface/src/Makefile.in |   18 ++++++++++++++++++
- 1 file changed, 18 insertions(+)
+ lib/erl_interface/src/Makefile.in | 19 +++++++++++++++++++
+ 1 file changed, 19 insertions(+)
 
 diff --git a/lib/erl_interface/src/Makefile.in b/lib/erl_interface/src/Makefile.in
-index 91a2cc9..99ad8b7 100644
+index 9aeba86..dafd2ce 100644
 --- a/lib/erl_interface/src/Makefile.in
 +++ b/lib/erl_interface/src/Makefile.in
-@@ -846,11 +846,29 @@ release: opt
- 	$(INSTALL_DIR) $(RELSYSDIR)/include
- 	$(INSTALL_DIR) $(RELSYSDIR)/lib
- 	$(INSTALL_DIR) $(RELSYSDIR)/bin
-+	$(INSTALL_DIR) $(RELSYSDIR)/src/auxdir
-+	$(INSTALL_DIR) $(RELSYSDIR)/src/connect
-+	$(INSTALL_DIR) $(RELSYSDIR)/src/decode
-+	$(INSTALL_DIR) $(RELSYSDIR)/src/encode
-+	$(INSTALL_DIR) $(RELSYSDIR)/src/epmd
-+	$(INSTALL_DIR) $(RELSYSDIR)/src/legacy
-+	$(INSTALL_DIR) $(RELSYSDIR)/src/misc
-+	$(INSTALL_DIR) $(RELSYSDIR)/src/prog
-+	$(INSTALL_DIR) $(RELSYSDIR)/src/registry
- 	$(INSTALL_DATA) $(HEADERS)     $(RELSYSDIR)/include
- 	$(INSTALL_DATA) $(OBJ_TARGETS) $(RELSYSDIR)/lib
+@@ -843,14 +843,33 @@ EXTRA = \
+ 	$(TARGET)/eidefs.mk
+ 
+ release: opt
++<<<<<<< HEAD
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/include"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/lib"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/bin"
++	$(INSTALL_DIR) "$(RELSYSDIR)/src/auxdir"
++	$(INSTALL_DIR) "$(RELSYSDIR)/src/connect"
++	$(INSTALL_DIR) "$(RELSYSDIR)/src/decode"
++	$(INSTALL_DIR) "$(RELSYSDIR)/src/encode"
++	$(INSTALL_DIR) "$(RELSYSDIR)/src/epmd"
++	$(INSTALL_DIR) "$(RELSYSDIR)/src/legacy"
++	$(INSTALL_DIR) "$(RELSYSDIR)/src/misc"
++	$(INSTALL_DIR) "$(RELSYSDIR)/src/prog"
++	$(INSTALL_DIR) "$(RELSYSDIR)/src/registry"
+ 	$(INSTALL_DATA) $(HEADERS)     "$(RELSYSDIR)/include"
+ 	$(INSTALL_DATA) $(OBJ_TARGETS) "$(RELSYSDIR)/lib"
  ifneq ($(EXE_TARGETS),)
- 	$(INSTALL_PROGRAM) $(EXE_TARGETS) $(RELSYSDIR)/bin
+ 	$(INSTALL_PROGRAM) $(EXE_TARGETS) "$(RELSYSDIR)/bin"
  endif
-+	$(INSTALL_DATA) $(EXTRA)        $(RELSYSDIR)/src
-+	$(INSTALL_DATA) connect/*.h  $(RELSYSDIR)/src/connect
-+	$(INSTALL_DATA) decode/*.h   $(RELSYSDIR)/src/decode
-+	$(INSTALL_DATA) encode/*.h   $(RELSYSDIR)/src/encode
-+	$(INSTALL_DATA) epmd/*.h     $(RELSYSDIR)/src/epmd
-+	$(INSTALL_DATA) misc/*.h     $(RELSYSDIR)/src/misc
-+	$(INSTALL_DATA) registry/*.h $(RELSYSDIR)/src/registry
-+	$(INSTALL_DATA) legacy/*.h   $(RELSYSDIR)/src/legacy
-+	$(INSTALL_DATA) prog/*.h     $(RELSYSDIR)/src/prog
++	$(INSTALL_DATA) $(EXTRA)        "$(RELSYSDIR)/src"
++	$(INSTALL_DATA) connect/*.h  "$(RELSYSDIR)/src/connect"
++	$(INSTALL_DATA) decode/*.h   "$(RELSYSDIR)/src/decode"
++	$(INSTALL_DATA) encode/*.h   "$(RELSYSDIR)/src/encode"
++	$(INSTALL_DATA) epmd/*.h     "$(RELSYSDIR)/src/epmd"
++	$(INSTALL_DATA) misc/*.h     "$(RELSYSDIR)/src/misc"
++	$(INSTALL_DATA) registry/*.h "$(RELSYSDIR)/src/registry"
++	$(INSTALL_DATA) legacy/*.h   "$(RELSYSDIR)/src/legacy"
++	$(INSTALL_DATA) prog/*.h     "$(RELSYSDIR)/src/prog"
  
  release_docs:
  
diff --git a/sources b/sources
index 14e9e70..ba69c1d 100644
--- a/sources
+++ b/sources
@@ -4,3 +4,6 @@ dd6c2a4807551b4a8a536067bde31d73  otp_src_R15B.tar.gz
 7569cae680eecd64e7e5d952be788ee5  otp_doc_html_R15B01.tar.gz
 d87412c2a1e6005bbe29dfe642a9ca20  otp_doc_man_R15B01.tar.gz
 f12d00f6e62b36ad027d6c0c08905fad  otp_src_R15B01.tar.gz
+36d91f123204f4c71a464985b1b2a375  otp_doc_html_R15B02.tar.gz
+974020ba533242fca759a7f5eaf628e5  otp_doc_man_R15B02.tar.gz
+ccbe5e032a2afe2390de8913bfe737a1  otp_src_R15B02.tar.gz