diff --git a/macros.rubygems b/macros.rubygems
index 45c59c4..0652ec6 100644
--- a/macros.rubygems
+++ b/macros.rubygems
@@ -3,12 +3,12 @@
 %gem_archdir %{_libdir}/gems
 
 # Common gem locations and files.
-%gem_instdir %{gem_dir}/gems/%{gem_name}-%{version}
-%gem_extdir_mri %{gem_archdir}/%{name}/%{gem_name}-%{version}
+%gem_instdir %{gem_dir}/gems/%{gem_name}-%{version}%{?prerelease}
+%gem_extdir_mri %{gem_archdir}/%{name}/%{gem_name}-%{version}%{?prerelease}
 %gem_libdir %{gem_instdir}/lib
-%gem_cache %{gem_dir}/cache/%{gem_name}-%{version}.gem
-%gem_spec %{gem_dir}/specifications/%{gem_name}-%{version}.gemspec
-%gem_docdir %{gem_dir}/doc/%{gem_name}-%{version}
+%gem_cache %{gem_dir}/cache/%{gem_name}-%{version}%{?prerelease}.gem
+%gem_spec %{gem_dir}/specifications/%{gem_name}-%{version}%{?prerelease}.gemspec
+%gem_docdir %{gem_dir}/doc/%{gem_name}-%{version}%{?prerelease}
 
 
 # %gem_install - Install gem into appropriate directory.
@@ -28,7 +28,7 @@ gem install \\\
         --build-root %{-d*}%{!?-d:.} \\\
         --force \\\
         --document=ri,rdoc \\\
-        %{-n*}%{!?-n:%{gem_name}-%{version}.gem} \
+        %{-n*}%{!?-n:%{gem_name}-%{version}%{?prerelease}.gem} \
 %{nil}
 
 
diff --git a/ruby.spec b/ruby.spec
index 3a509c5..29b0ece 100644
--- a/ruby.spec
+++ b/ruby.spec
@@ -1018,6 +1018,7 @@ make check TESTS="-v $DISABLE_TESTS"
 - Make symlinks for json gem.
 - Tk is removed from stdlib.
 - Harden package.
+- Extend 'gem_' macros for pre-release version support.
 
 * Mon May 23 2016 Vít Ondruch <vondruch@redhat.com> - 2.3.1-56
 - Requires rubygem(json) for rubygem-rdoc (rhbz#1325022).