diff --git a/ipv6calc.spec b/ipv6calc.spec
index 632c3a2..0f8032f 100644
--- a/ipv6calc.spec
+++ b/ipv6calc.spec
@@ -1,14 +1,14 @@
 Summary: 	IPv6 address format change and calculation utility
 Name: 		ipv6calc
 Version: 	0.61
-Release: 	1
+Release:	2%{?dist}	
 Group:		Applications/Text
 URL: 		http://www.deepspace6.net/projects/%{name}.html
-License: 	GNU GPL version 2
+License: 	GPL
 Source: 	ftp://ftp.bieringer.de/pub/linux/IPv6/ipv6calc/%{name}-%{version}.tar.gz
 Requires:	krb5-libs
 BuildRequires:	krb5-devel
-BuildRoot:	%{_tmppath}/%{name}-%{version}-root
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
 ipv6calc is a small utility which formats and calculates IPv6 addresses in
@@ -25,7 +25,7 @@ Many more format conversions are supported, see given URL for more.
 %configure
 
 %build
-make COPTS="$RPM_OPT_FLAGS"
+make %{?_smp_mflags} COPTS="$RPM_OPT_FLAGS"
 	
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -33,11 +33,11 @@ make installonly root=$RPM_BUILD_ROOT
 
 # Copy examples and helper files together
 mkdir -p redhat/{ipv6logconv,ipv6logstats/examples-{data,gri},ipv6calcweb}
-cp -f ipv6calcweb/{USAGE,ipv6calcweb.cgi} redhat/ipv6calcweb
-cp -f examples/analog/{analog-,ipv6calc.tab,run_analog.sh}* redhat/ipv6logconv
-cp -f ipv6logstats/{README,collect_,example_}* redhat/ipv6logstats
-cp -f ipv6logstats/examples-data/*.txt redhat/ipv6logstats/examples-data
-cp -f ipv6logstats/examples-gri/*.gri redhat/ipv6logstats/examples-gri
+cp -pf ipv6calcweb/{USAGE,ipv6calcweb.cgi} redhat/ipv6calcweb
+cp -pf examples/analog/{analog-,ipv6calc.tab,run_analog.sh}* redhat/ipv6logconv
+cp -pf ipv6logstats/{README,collect_,example_}* redhat/ipv6logstats
+cp -pf ipv6logstats/examples-data/*.txt redhat/ipv6logstats/examples-data
+cp -pf ipv6logstats/examples-gri/*.gri redhat/ipv6logstats/examples-gri
  
 %check
 make test
@@ -46,8 +46,7 @@ make test
 rm -rf $RPM_BUILD_ROOT
 
 %files
-%defattr(-,root,root)
-
+%defattr(-,root,root,-)
 %doc ChangeLog README CREDITS TODO COPYING LICENSE USAGE doc/ipv6calc.* redhat/*
 %{_bindir}/%{name}
 %{_bindir}/ipv6logconv
@@ -55,6 +54,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man8/*
 
 %changelog
+* Tue Feb 27 2007 Marcela Maslanova <mmaslano@redhat.com> - 0.61-2
+- package merge review
+- rhbz#225910
+
 * Fri Sep 01 2006 Marcela Maslanova <mmaslano@redhat.com> - 0.61-1
 - upgrade to 0.61-1 - from upstream
 
@@ -123,7 +126,7 @@ rm -rf $RPM_BUILD_ROOT
 - add configure options
 
 * Tue Nov 11 2002 Peter Bieringer <pb@bieringer.de>
-- change IPv6 address in %description
+- change IPv6 address in description
 
 * Sat Apr 20 2002 Peter Bieringer <pb@bieringer.de>
 - Change URL
@@ -160,13 +163,13 @@ rm -rf $RPM_BUILD_ROOT
 - Fix permissions of doc files
 
 * Thu Mar 15 2001 Peter Bieringer <pb@bieringer.de>
-- Add doc directory also to %files to make sure the directory will be removed
-   on update or deinstall
+- Add doc directory also to files to make sure the directory will be removed
+  on update or deinstall
 - change install permissions for entries in doc directory
 - change "make install" to "make installonly" (make test should be only executed once" 
 
 * Wed Mar 14 2001 Peter Bieringer <pb@bieringer.de>
-- Add "make clean" and "make test" on %build
+- Add "make clean" and "make test" on build
 
 * Tue Mar 13 2001 Peter Bieringer <pb@bieringer.de>
 - add CREDITS and TODO for install