diff --git a/Makefile b/Makefile
index c6bda53..c4ab76b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 # Makefile for source rpm: elfutils
-# $Id: Makefile,v 1.13 2005/12/08 01:48:13 roland Exp $
+# $Id: Makefile,v 1.14 2006/06/15 08:32:05 roland Exp $
 NAME := elfutils
 SPECFILE = elfutils.spec
 
@@ -21,7 +21,7 @@ elfutils-portable.spec: elfutils.spec
 	(echo '%define _with_compat 1'; cat $<) > $@.new
 	mv -f $@.new $@
 
-portable-vr = $(VERSION)-0.$(RELEASE)
+portable-vr = $(VERSION)-0.$(subst $(DIST),,$(RELEASE))
 portable.srpm = elfutils-$(portable-vr).src.rpm
 $(portable.srpm): elfutils-portable.spec elfutils-portability.patch \
 		  elfutils-$(VERSION).tar.gz
diff --git a/elfutils.spec b/elfutils.spec
index 4ac8b65..b4d6c55 100644
--- a/elfutils.spec
+++ b/elfutils.spec
@@ -13,7 +13,7 @@ Version: %{eu_version}
 %if !%{compat}
 Release: %{eu_release}%{?dist}
 %else
-Release: 0.%{eu_release}.1
+Release: 0.%{eu_release}
 %endif
 License: GPL
 Group: Development/Tools