diff --git a/java-9-openjdk.spec b/java-9-openjdk.spec
index 39c7cb5..a110327 100644
--- a/java-9-openjdk.spec
+++ b/java-9-openjdk.spec
@@ -981,7 +981,7 @@ The OpenJDK runtime environment.
 Summary: OpenJDK Runtime Environment %{debug_on}
 Group:   Development/Languages
 
-%{java_rpo %{debug_suffix_unquoted}}
+%{java_rpo -- %{debug_suffix_unquoted}}
 %description debug
 The OpenJDK runtime environment.
 %{debug_warning}
@@ -1003,7 +1003,7 @@ The OpenJDK runtime environment without audio and video support.
 Summary: OpenJDK Runtime Environment %{debug_on}
 Group:   Development/Languages
 
-%{java_headless_rpo %{debug_suffix_unquoted}}
+%{java_headless_rpo -- %{debug_suffix_unquoted}}
 
 %description headless-debug
 The OpenJDK runtime environment without audio and video support.
@@ -1026,7 +1026,7 @@ The OpenJDK development tools.
 Summary: OpenJDK Development Environment %{debug_on}
 Group:   Development/Tools
 
-%{java_devel_rpo %{debug_suffix_unquoted}}
+%{java_devel_rpo -- %{debug_suffix_unquoted}}
 
 %description devel-debug
 The OpenJDK development tools.
@@ -1049,7 +1049,7 @@ The JMods for OpenJDK.
 Summary: JMods for OpenJDK %{debug_on}
 Group:   Development/Tools
 
-%{java_jmods_rpo %{debug_suffix_unquoted}}
+%{java_jmods_rpo -- %{debug_suffix_unquoted}}
 
 %description jmods-debug
 The JMods for OpenJDK.
@@ -1072,7 +1072,7 @@ The OpenJDK demos.
 Summary: OpenJDK Demos %{debug_on}
 Group:   Development/Languages
 
-%{java_demo_rpo %{debug_suffix_unquoted}}
+%{java_demo_rpo -- %{debug_suffix_unquoted}}
 
 %description demo-debug
 The OpenJDK demos.
@@ -1095,7 +1095,7 @@ The OpenJDK source bundle.
 Summary: OpenJDK Source Bundle %{for_debug}
 Group:   Development/Languages
 
-%{java_src_rpo %{debug_suffix_unquoted}}
+%{java_src_rpo -- %{debug_suffix_unquoted}}
 
 %description src-debug
 The OpenJDK source bundle %{for_debug}.
@@ -1133,7 +1133,7 @@ Group:   Documentation
 Requires: javapackages-tools
 BuildArch: noarch
 
-%{java_javadoc_rpo %{debug_suffix_unquoted}}
+%{java_javadoc_rpo -- %{debug_suffix_unquoted}}
 
 %description javadoc-debug
 The OpenJDK API documentation %{for_debug}.
@@ -1145,7 +1145,7 @@ Summary: OpenJDK API Documentation compressed in single archive %{for_debug}
 Group:   Documentation
 Requires: javapackages-tools
 
-%{java_javadoc_rpo %{debug_suffix_unquoted}}
+%{java_javadoc_rpo -- %{debug_suffix_unquoted}}
 
 %description javadoc-zip-debug
 The OpenJDK API documentation compressed in single archive %{for_debug}.
@@ -1173,7 +1173,7 @@ need to.
 %package accessibility-debug
 Summary: OpenJDK accessibility connector %{for_debug}
 
-%{java_accessibility_rpo %{debug_suffix_unquoted}}
+%{java_accessibility_rpo -- %{debug_suffix_unquoted}}
 
 %description accessibility-debug
 See normal java-%{version}-openjdk-accessibility description.
@@ -1687,40 +1687,40 @@ require "copy_jdk_configs.lua"
 
 %if %{include_debug_build} 
 %post debug
-%{post_script %{debug_suffix_unquoted}}
+%{post_script -- %{debug_suffix_unquoted}}
 
 %post headless-debug
-%{post_headless %{debug_suffix_unquoted}}
+%{post_headless -- %{debug_suffix_unquoted}}
 
 %postun debug
-%{postun_script %{debug_suffix_unquoted}}
+%{postun_script -- %{debug_suffix_unquoted}}
 
 %postun headless-debug
-%{postun_headless %{debug_suffix_unquoted}}
+%{postun_headless -- %{debug_suffix_unquoted}}
 
 %posttrans debug
-%{posttrans_script %{debug_suffix_unquoted}}
+%{posttrans_script -- %{debug_suffix_unquoted}}
 
 %post devel-debug
-%{post_devel %{debug_suffix_unquoted}}
+%{post_devel -- %{debug_suffix_unquoted}}
 
 %postun devel-debug
-%{postun_devel %{debug_suffix_unquoted}}
+%{postun_devel -- %{debug_suffix_unquoted}}
 
 %posttrans  devel-debug
-%{posttrans_devel %{debug_suffix_unquoted}}
+%{posttrans_devel -- %{debug_suffix_unquoted}}
 
 %post javadoc-debug
-%{post_javadoc %{debug_suffix_unquoted}}
+%{post_javadoc -- %{debug_suffix_unquoted}}
 
 %postun javadoc-debug
-%{postun_javadoc %{debug_suffix_unquoted}}
+%{postun_javadoc -- %{debug_suffix_unquoted}}
 
 %post javadoc-zip-debug
-%{post_javadoc_zip %{debug_suffix_unquoted}}
+%{post_javadoc_zip -- %{debug_suffix_unquoted}}
 
 %postun javadoc-zip-debug
-%{postun_javadoc_zip %{debug_suffix_unquoted}}
+%{postun_javadoc_zip -- %{debug_suffix_unquoted}}
 
 %endif
 
@@ -1764,31 +1764,31 @@ require "copy_jdk_configs.lua"
 
 %if %{include_debug_build} 
 %files debug
-%{files_jre %{debug_suffix_unquoted}}
+%{files_jre -- %{debug_suffix_unquoted}}
 
 %files headless-debug
-%{files_jre_headless %{debug_suffix_unquoted}}
+%{files_jre_headless -- %{debug_suffix_unquoted}}
 
 %files devel-debug
-%{files_devel %{debug_suffix_unquoted}}
+%{files_devel -- %{debug_suffix_unquoted}}
 
 %files jmods-debug
-%{files_jmods %{debug_suffix_unquoted}}
+%{files_jmods -- %{debug_suffix_unquoted}}
 
 %files demo-debug -f %{name}-demo.files-debug
-%{files_demo %{debug_suffix_unquoted}}
+%{files_demo -- %{debug_suffix_unquoted}}
 
 %files src-debug
-%{files_src %{debug_suffix_unquoted}}
+%{files_src -- %{debug_suffix_unquoted}}
 
 %files javadoc-debug
-%{files_javadoc %{debug_suffix_unquoted}}
+%{files_javadoc -- %{debug_suffix_unquoted}}
 
 %files javadoc-zip-debug
-%{files_javadoc_zip %{debug_suffix_unquoted}}
+%{files_javadoc_zip -- %{debug_suffix_unquoted}}
 
 %files accessibility-debug
-%{files_accessibility %{debug_suffix_unquoted}}
+%{files_accessibility -- %{debug_suffix_unquoted}}
 %endif