diff --git a/mt-st-1.1-redhat.patch b/mt-st-1.1-redhat.patch
index 93938cc..f2f4385 100644
--- a/mt-st-1.1-redhat.patch
+++ b/mt-st-1.1-redhat.patch
@@ -7,10 +7,10 @@
 -USRBINDIR= /usr/bin
 -MANDIR= /usr/share/man
 +CFLAGS=  $(RPM_OPT_FLAGS)
-+SBINDIR= $(RPM_BUILD_ROOT)/sbin
-+BINDIR=  $(RPM_BUILD_ROOT)/bin
-+USRBINDIR=  $(RPM_BUILD_ROOT)/$(bindir)
-+MANDIR= $(RPM_BUILD_ROOT)/$(mandir)
++SBINDIR= $(RPM_BUILD_ROOT)/usr/sbin
++BINDIR=  $(RPM_BUILD_ROOT)/usr/bin
++USRBINDIR=  $(RPM_BUILD_ROOT)/usr/bin
++MANDIR= $(RPM_BUILD_ROOT)/usr/share/man
 +CC=gcc
  
  MTDIR=$(BINDIR)
diff --git a/mt-st.spec b/mt-st.spec
index 433583b..a6c36a7 100644
--- a/mt-st.spec
+++ b/mt-st.spec
@@ -1,7 +1,7 @@
 Summary: Tool for controlling tape drives
 Name: mt-st
 Version: 1.1
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: GPL+
 Group: Applications/System
 URL: ftp://ftp.ibiblio.org/pub/linux/system/backup
@@ -12,7 +12,6 @@ Patch1: mt-st-1.1-SDLT.patch
 Patch2: mt-st-0.7-config-files.patch
 Patch3: mt-st-0.9b-manfix.patch
 Patch4: mt-st-1.1-mtio.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires(post): systemd-units
 Requires(preun): systemd-units
 Requires(postun): systemd-units
@@ -47,15 +46,10 @@ make CFLAGS="$RPM_OPT_FLAGS"
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make install mandir=%{_mandir}
+make install
 install -D -p -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_unitdir}/stinit.service
 
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
 %post
 if [ $1 -eq 1 ] ; then 
     # Initial installation 
@@ -88,15 +82,17 @@ fi
 
 
 %files
-%defattr(-,root,root,-)
 %doc COPYING README README.stinit mt-st-1.1.lsm stinit.def.examples
-/bin/mt
-/sbin/stinit
+%{_bindir}/mt
+%{_sbindir}/stinit
 %{_mandir}/man[18]/*
 %{_unitdir}/stinit.service
 
 
 %changelog
+* Tue Nov 20 2012 Dan Horák <dan[at]danny.cz> - 1.1-9
+- spec cleanup
+
 * Fri Jul 20 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
diff --git a/stinit.init b/stinit.init
deleted file mode 100755
index f502105..0000000
--- a/stinit.init
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/bash
-#
-# stinit	Initialize SCSI tape drives
-# 
-# chkconfig: - 90 10
-# description: Initialize SCSI tape drives with /sbin/stinit
-# config: /etc/stinit.def
-
-# BEGIN INIT INFO
-# Provides:          stinit
-# Default-Start:
-# Default-Stop:      0 1 2 3 4 5 6
-# Short-Description: Initialize SCSI tape drives
-# Description:       Initialize SCSI tape drives
-# END INIT INFO
-
-. /etc/init.d/functions
-
-exec=/sbin/stinit
-config=/etc/stinit.def
-
-# See how we were called.
-case "$1" in
-  start)
-        [ -x $exec ] || exit 5
-        [ -f $config ] || exit 6
-	$exec
-        ;;
-  stop)
-	;;
-  *)
-        echo $"Usage: $0 {start}"
-        exit 2
-esac
-exit 0