diff --git a/irssi.spec b/irssi.spec
index 9992a38..c0461bf 100644
--- a/irssi.spec
+++ b/irssi.spec
@@ -1,51 +1,46 @@
 %define		perl_vendorarch	%(eval "`perl -V:installvendorarch`"; echo $installvendorarch)
 
-Summary: 	Modular text mode IRC client with Perl scripting
-Name: 		irssi
-Version: 	0.8.9
-Release: 	5
-Epoch: 		0
-License: 	GPL
-Group: 		Applications/Communications
-URL: 		http://irssi.org/
-Source0: 	http://irssi.org/files/%{name}-%{version}.tar.bz2
+Summary:	Modular text mode IRC client with Perl scripting
+Name:		irssi
+Version:	0.8.9
+Release:	5
+License:	GPL
+Group:		Applications/Communications
+URL:		http://irssi.org/
+Source0:	http://irssi.org/files/%{name}-%{version}.tar.bz2
 Source1:	http://wouter.coekaerts.be/irssi/scripts/replace.pl
 Source2:	http://wouter.coekaerts.be/irssi/scripts/trigger.pl
 Source3:	http://wouter.coekaerts.be/irssi/scripts/convert-replace-trigger.pl
 Patch1:		convert-replace-trigger.pl-fixpath-patch
-BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildRequires:	ncurses-devel openssl-devel zlib-devel pkgconfig gc-devel
 %{?_with_glib1:BuildRequires:	glib-devel}
 %{!?_with_glib1:BuildRequires:	glib2-devel}
 
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
-# ----------------------------------------------------------------------------
 
 %description
 Irssi is a modular IRC client with Perl scripting. Only text-mode
 frontend is currently supported. The GTK/GNOME frontend is no longer
 being maintained.
 
-# ----------------------------------------------------------------------------
 
 %prep
 %setup -q
 install -m 0644 %{SOURCE3} .
 %patch1 -p0
 
-# ----------------------------------------------------------------------------
 
 %build
 %configure --enable-ipv6 --with-textui	\
-%{?_with_glib1:	 --with-glib1}		\
-	 --with-proxy			\
-	 --with-bot			\
-	 --with-perl=module		\
-	 --with-perl-lib=vendor --with-gc
+%{?_with_glib1:	--with-glib1}		\
+	--with-proxy			\
+	--with-bot			\
+	--with-perl=module		\
+	--with-perl-lib=vendor --with-gc
 make %{?_smp_mflags}
 
-# ----------------------------------------------------------------------------
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -56,7 +51,7 @@ install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/%{name}/scripts
 install -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/%{name}/scripts
 
 # Clean up
-rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/modules/lib*.*a 
+rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/modules/lib*.*a
 rm -Rf $RPM_BUILD_ROOT/%{_docdir}/%{name}
 find $RPM_BUILD_ROOT%{perl_vendorarch} -type f -a -name '*.bs' -a -empty -exec rm -f {} ';'
 find $RPM_BUILD_ROOT%{perl_vendorarch} -type f -a -name .packlist -exec rm {} ';'
@@ -64,12 +59,10 @@ find $RPM_BUILD_ROOT%{perl_vendorarch} -type f -a -name .packlist -exec rm {} ';
 # Fix permissions
 chmod -R u+w $RPM_BUILD_ROOT%{perl_vendorarch}
 
-# ----------------------------------------------------------------------------
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-# ----------------------------------------------------------------------------
 
 %files
 %defattr(-,root,root,-)
@@ -83,7 +76,6 @@ rm -rf $RPM_BUILD_ROOT
 %{perl_vendorarch}/Irssi*
 %{perl_vendorarch}/auto/Irssi
 
-# ----------------------------------------------------------------------------
 
 %changelog
 * Fri Dec 24 2004 Michael Schwendt <mschwendt[AT]users.sf.net> 0:0.8.9-5
@@ -135,7 +127,7 @@ rm -rf $RPM_BUILD_ROOT
 - Added zlib-devel buildrequires
 
 * Sat Jul 12 2003 Dams <anvil[AT]livna.org> 0:0.8.6-0.fdr.6
-- Applied Patches from Ville Skyttä (bug #277 comment #11 and 
+- Applied Patches from Ville Skyttä (bug #277 comment #11 and
   comment #12)
 
 * Mon Jun 23 2003 Dams <anvil[AT]livna.org> 0:0.8.6-0.fdr.5
@@ -151,5 +143,5 @@ rm -rf $RPM_BUILD_ROOT
 - Exclude modules ".a" files
 - Include more files as doc
 
-* Sat May 10 2003 Dams <anvil[AT]livna.org> 
+* Sat May 10 2003 Dams <anvil[AT]livna.org>
 - Initial build.