diff --git a/python-configshell-fb.changes b/python-configshell-fb.changes
index 4dfa7dd..7424e74 100644
--- a/python-configshell-fb.changes
+++ b/python-configshell-fb.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri May  6 07:36:56 UTC 2016 - dmueller@suse.com
+
+- cleanup buildroot parts
+
 -------------------------------------------------------------------
 Tue Apr 19 17:28:26 UTC 2016 - lduncan@suse.com
 
diff --git a/python-configshell-fb.spec b/python-configshell-fb.spec
index bcb9970..d6dac51 100644
--- a/python-configshell-fb.spec
+++ b/python-configshell-fb.spec
@@ -15,30 +15,31 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
+
 %define oname configshell-fb
 %define realver  1.1.fb20
 
-Name:          python-%{oname}
-Version:       1.20
-Release:       1%{?dist}
-License:       Apache-2.0
-Group:         Development/Libraries/Python
-URL:           http://github.com/agrover/configshell-fb
-Summary:       A Python library for building configuration shells
-Source:        %{oname}-%{realver}.tar.gz
-Provides:      python-configshell = %{version}
-Obsoletes:     python-configshell < %{version}
-Requires:      python-pyparsing
-Requires:      python-six
-Requires:      /usr/bin/python
-BuildArch:     noarch
-BuildRequires: python-devel
-BuildRequires: python-setuptools
-BuildRequires: python-six
-BuildRequires: python-pyparsing
-BuildRequires: python-urwid
-BuildRequires: fdupes
-BuildRoot:     %{_tmppath}/%{name}-root
+Name:           python-%{oname}
+Version:        1.20
+Release:        1%{?dist}
+Url:            http://github.com/agrover/configshell-fb
+Summary:        A Python library for building configuration shells
+License:        Apache-2.0
+Group:          Development/Libraries/Python
+Source:         %{oname}-%{realver}.tar.gz
+Provides:       python-configshell = %{version}
+Obsoletes:      python-configshell < %{version}
+Requires:       /usr/bin/python
+Requires:       python-pyparsing
+Requires:       python-six
+BuildArch:      noarch
+BuildRequires:  fdupes
+BuildRequires:  python-devel
+BuildRequires:  python-pyparsing
+BuildRequires:  python-setuptools
+BuildRequires:  python-six
+BuildRequires:  python-urwid
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
 configshell-fb is a Python library that provides a framework for building simple
@@ -51,10 +52,10 @@ rtslib, and configshell, or stick with all non-fb versions, since they are
 no longer strictly compatible.
 
 %package doc
-Summary:       Documentation for Python configshell-fb
-Group:         Documentation/HTML
-BuildArch:     noarch
-BuildRequires: epydoc
+Summary:        Documentation for Python configshell-fb
+Group:          Documentation/HTML
+BuildArch:      noarch
+BuildRequires:  epydoc
 
 %description doc
 configshell-fb is a Python library that provides a framework for building simple
@@ -76,16 +77,12 @@ epydoc --no-sourcecode --html -n %{oname} --exclude configobj configshell/*.py
 %__mv html doc/
 
 %install
-[ "%{buildroot}" != "/" ] && %{__rm} -rf %{buildroot}
 %__python setup.py install --skip-build --prefix=%{_prefix} --root=%{buildroot}
 %fdupes %{buildroot}%{python_sitelib}
 %__install -d -m755 %{buildroot}%{_defaultdocdir}/python-configshell-doc-%{version}
 %__cp -r doc/* %{buildroot}%{_defaultdocdir}/python-configshell-doc-%{version}/
 %fdupes %{buildroot}%{_defaultdocdir}
 
-%clean
-[ "%{buildroot}" != "/" ] && %{__rm} -rf %{buildroot}
-
 %files
 %defattr(-,root,root)
 %{python_sitelib}/*
@@ -96,4 +93,3 @@ epydoc --no-sourcecode --html -n %{oname} --exclude configobj configshell/*.py
 %{_defaultdocdir}/python-configshell-doc-%{version}
 
 %changelog
-