diff --git a/krb5-mini.changes b/krb5-mini.changes
index 56f5148..96d186a 100644
--- a/krb5-mini.changes
+++ b/krb5-mini.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Thu Feb 11 15:07:26 UTC 2016 - hguo@suse.com
+
+- Remove krb5 pieces from spec file.
+  Hence remove pre_checkin.sh
+- Remove expired macros and other minor clena-ups in spec file.
+- Change package description to explain what "mini" means.
+
 -------------------------------------------------------------------
 Mon Jan 11 12:33:54 UTC 2016 - idonmez@suse.com
 
diff --git a/krb5-mini.spec b/krb5-mini.spec
index da1083a..bcb7f24 100644
--- a/krb5-mini.spec
+++ b/krb5-mini.spec
@@ -16,7 +16,6 @@
 #
 
 
-%define build_mini 1
 %define srcRoot krb5-1.14
 %define vendorFiles %{_builddir}/%{srcRoot}/vendor-files/
 %define krb5docdir  %{_defaultdocdir}/krb5
@@ -32,39 +31,22 @@ BuildRequires:  libselinux-devel
 BuildRequires:  ncurses-devel
 Version:        1.14
 Release:        0
-Summary:        MIT Kerberos5 Implementation--Libraries
+Summary:        MIT Kerberos5 implementation and libraries with minimal dependencies
 License:        MIT
 Group:          Productivity/Networking/Security
 Obsoletes:      krb5-plugin-preauth-pkinit-nss
 BuildRequires:  libverto-devel
-%if ! 0%{?build_mini}
-BuildRequires:  doxygen
-BuildRequires:  libopenssl-devel
-BuildRequires:  openldap2-devel
-BuildRequires:  pam-devel
-BuildRequires:  python-Cheetah
-BuildRequires:  python-Sphinx
-BuildRequires:  python-libxml2
-BuildRequires:  python-lxml
-%if 0%{?suse_version} >= 1210
-BuildRequires:  pkgconfig(systemd)
-%{?systemd_requires}
-%else
-PreReq:         %insserv_prereq 
-%endif
 # bug437293
 %ifarch ppc64
 Obsoletes:      krb5-64bit
 %endif
 Conflicts:      krb5-mini
-%else # -mini
 Conflicts:      krb5
 Conflicts:      krb5-client
 Conflicts:      krb5-server
 Conflicts:      krb5-plugin-kdb-ldap
 Conflicts:      krb5-plugin-preauth-pkinit
 Conflicts:      krb5-plugin-preauth-otp
-%endif
 # both tar.gz and .tar.gz.asc extracted from the http://web.mit.edu/kerberos/dist/krb5/1.13/krb5-1.13.2-signed.tar
 Source:         krb5-%{version}.tar.gz
 Source42:       krb5-%version.tar.gz.asc
@@ -94,76 +76,8 @@ PreReq:         %fillup_prereq
 Kerberos V5 is a trusted-third-party network authentication system,
 which can improve your network's security by eliminating the insecure
 practice of clear text passwords.
-
-%if ! %{build_mini}
-
-%package client
-Conflicts:      krb5-mini
-Summary:        MIT Kerberos5 implementation - client programs
-Group:          Productivity/Networking/Security
-
-%description client
-Kerberos V5 is a trusted-third-party network authentication system,
-which can improve your network's security by eliminating the insecure
-practice of cleartext passwords. This package includes some required
-client programs, like kinit, kadmin, ...
-
-%package server
-Summary:        MIT Kerberos5 implementation - server
-Group:          Productivity/Networking/Security
-Requires:       cron
-Requires:       libverto-libev1
-Requires:       logrotate
-Requires:       perl-Date-Calc
-%{?systemd_requires}
-PreReq:         %insserv_prereq %fillup_prereq
-
-%description server
-Kerberos V5 is a trusted-third-party network authentication system,
-which can improve your network's security by eliminating the insecure
-practice of cleartext passwords. This package includes the kdc, kadmind
-and more.
-
-%package plugin-kdb-ldap
-Summary:        MIT Kerberos5 Implementation--LDAP Database Plugin
-Group:          Productivity/Networking/Security
-Requires:       krb5-server = %{version}
-
-%description plugin-kdb-ldap
-Kerberos V5 is a trusted-third-party network authentication system,
-which can improve your network's security by eliminating the insecure
-practice of clear text passwords. This package contains the LDAP
-database plugin.
-
-%package plugin-preauth-pkinit
-Summary:        MIT Kerberos5 Implementation--PKINIT preauth Plugin
-Group:          Productivity/Networking/Security
-
-%description plugin-preauth-pkinit
-Kerberos V5 is a trusted-third-party network authentication system,
-which can improve your network's security by eliminating the insecure
-practice of cleartext passwords. This package includes a PKINIT plugin.
-
-%package plugin-preauth-otp
-Summary:        MIT Kerberos5 Implementation--OTP preauth Plugin
-Group:          Productivity/Networking/Security
-
-%description plugin-preauth-otp
-Kerberos V5 is a trusted-third-party network authentication system,
-which can improve your network's security by eliminating the insecure
-practice of cleartext passwords. This package includes a OTP plugin.
-
-%package doc
-Summary:        MIT Kerberos5 Implementation--Documentation
-Group:          Documentation/Other
-
-%description doc
-Kerberos V5 is a trusted-third-party network authentication
-system,which can improve your network's security by eliminating the
-insecurepractice of clear text passwords. This package includes
-extended documentation for MIT Kerberos.
-
-%endif #! build_mini
+The package delivers MIT Kerberos with reduced features and minimal
+dependencies
 
 %package devel
 Summary:        MIT Kerberos5 - Include Files and Libraries
@@ -176,13 +90,8 @@ Requires:       libverto-devel
 %ifarch ppc64
 Obsoletes:      krb5-devel-64bit
 %endif
-%if %{build_mini}
 Provides:       krb5-devel = %{version}
 Conflicts:      krb5-devel
-%else
-Conflicts:      krb5-mini-devel
-%endif
-#
 
 %description devel
 Kerberos V5 is a trusted-third-party network authentication system,
@@ -231,26 +140,13 @@ DEFCCNAME=DIR:/run/user/%%{uid}/krb5cc; export DEFCCNAME
 	--disable-static \
         --enable-dns-for-realm \
         --disable-rpath \
-%if ! %{build_mini}
-        --with-ldap \
-        --with-pam \
-        --enable-pkinit \
-        --with-pkinit-crypto-impl=openssl \
-%else
         --disable-pkinit \
         --without-pam \
-%endif
         --with-selinux \
         --with-system-et \
         --with-system-ss \
         --with-system-verto
 %{__make} %{?_smp_mflags}
-%if ! 0%{?build_mini}
-cd doc
-make %{?jobs:-j%jobs} substhtml
-cp -a html_subst ../../html
-cd ..
-%endif
 
 # Copy kadmin manual page into kadmin.local's due to the split between client and server package
 cp man/kadmin.man man/kadmin.local.8
@@ -344,109 +240,38 @@ ln -sf ../../usr/lib/mit/bin/klist   %{buildroot}/usr/bin/klist
 # install doc
 install -d -m 755 %{buildroot}/%{krb5docdir}
 install -m 644 %{_builddir}/%{srcRoot}/README %{buildroot}/%{krb5docdir}/README
-%if ! %{build_mini}
-install -m 644 %{_builddir}/%{srcRoot}/src/plugins/kdb/ldap/libkdb_ldap/kerberos.schema %{buildroot}/%{krb5docdir}/kerberos.schema
-install -m 644 %{_builddir}/%{srcRoot}/src/plugins/kdb/ldap/libkdb_ldap/kerberos.ldif %{buildroot}/%{krb5docdir}/kerberos.ldif
-%endif
 # cleanup
 rm -f  %{buildroot}/usr/share/man/man1/tmac.doc*
 rm -f  /usr/share/man/man1/tmac.doc*
 rm -rf %{buildroot}/usr/lib/mit/share/examples
-%if %{build_mini}
 # manually remove otp plugin for krb5-mini since configure
 # doesn't support disabling it at build time
 rm -f %{buildroot}/%{_libdir}/krb5/plugins/preauth/otp.so
-%endif
 # manually remove test plugin since configure doesn't support disabling it at build time
 rm -f %{buildroot}/%{_libdir}/krb5/plugins/preauth/test.so
 
 %find_lang mit-krb5
 
 #####################################################
-# krb5(-mini) pre/post/postun
+# krb5-mini pre/post/postun
 #####################################################
 
-%if %{build_mini}
-
 %preun
-%if 0%{?suse_version} >= 1210
 %service_del_preun krb5kdc.service kadmind.service kpropd.service
-%else
-%stop_on_removal krb5kdc kadmind kpropd
-%endif
 
 %postun
 /sbin/ldconfig
-%if 0%{?suse_version} >= 1210
 %service_del_postun krb5kdc.service kadmind.service kpropd.service
-%else
-%restart_on_update krb5kdc kadmind kpropd
-%{insserv_cleanup}
-%endif
 
 %post 
 /sbin/ldconfig
-%if 0%{?suse_version} >= 1210
 %service_add_post krb5kdc.service kadmind.service kpropd.service
-%endif
 %{fillup_only -n kadmind}
 %{fillup_only -n krb5kdc}
 %{fillup_only -n kpropd}
 
 %pre
-%if 0%{?suse_version} >= 1210
 %service_add_pre krb5kdc.service kadmind.service kpropd.service
-%endif
-
-%else
-
-%post -p /sbin/ldconfig
-
-%postun
-/sbin/ldconfig
-
-#####################################################
-# krb5-server preun/postun/pre/post
-#####################################################
-
-%preun server
-%if 0%{?suse_version} >= 1210
-%service_del_preun krb5kdc.service kadmind.service kpropd.service
-%else
-%stop_on_removal krb5kdc kadmind kpropd
-%endif
-
-%postun server
-%if 0%{?suse_version} >= 1210
-%service_del_postun krb5kdc.service kadmind.service kpropd.service
-%else
-%restart_on_update krb5kdc kadmind kpropd
-%{insserv_cleanup}
-%endif
-
-%post server
-%if 0%{?suse_version} >= 1210
-%service_add_post krb5kdc.service kadmind.service kpropd.service
-%endif
-%{fillup_only -n kadmind}
-%{fillup_only -n krb5kdc}
-%{fillup_only -n kpropd}
-
-%pre server
-%if 0%{?suse_version} >= 1210
-%service_add_pre krb5kdc.service kadmind.service kpropd.service
-%endif
-
-#####################################################
-# krb5-plugin-kdb-ldap post/postun
-#####################################################
-
-%post plugin-kdb-ldap -p /sbin/ldconfig
-
-%postun plugin-kdb-ldap
-/sbin/ldconfig
-
-%endif
 
 ########################################################
 # files sections
@@ -483,8 +308,6 @@ rm -f %{buildroot}/%{_libdir}/krb5/plugins/preauth/test.so
 %{_mandir}/man1/krb5-config.1*
 %{_datadir}/aclocal/ac_check_krb5.m4
 
-%if %{build_mini}
-
 %files -f mit-krb5.lang
 %defattr(-,root,root)
 %dir %{krb5docdir}
@@ -512,13 +335,9 @@ rm -f %{buildroot}/%{_libdir}/krb5/plugins/preauth/test.so
 %attr(0600,root,root) %config(noreplace) %{_localstatedir}/lib/kerberos/krb5kdc/kadm5.dict
 %config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/k*
 %{_var}/adm/fillup-templates/sysconfig.*
-%if 0%{?suse_version} >= 1210
 %{_unitdir}/kadmind.service
 %{_unitdir}/krb5kdc.service
 %{_unitdir}/kpropd.service
-%else
-%{_sysconfdir}/init.d/*
-%endif
 %{_libdir}/libgssapi_krb5.*
 %{_libdir}/libgssrpc.so.*
 %{_libdir}/libk5crypto.so.*
@@ -530,7 +349,6 @@ rm -f %{buildroot}/%{_libdir}/krb5/plugins/preauth/test.so
 %{_libdir}/libkrad.so.*
 %{_libdir}/krb5/plugins/kdb/*
 %{_libdir}/krb5/plugins/tls/*
-#/usr/lib/mit/sbin/*
 /usr/lib/mit/sbin/kadmin.local
 /usr/lib/mit/sbin/kadmind
 /usr/lib/mit/sbin/kpropd
@@ -559,7 +377,6 @@ rm -f %{buildroot}/%{_libdir}/krb5/plugins/preauth/test.so
 /usr/bin/kinit
 /usr/bin/klist
 /usr/sbin/rc*
-#%{_mandir}/man1/*
 %{_mandir}/man1/kvno.1*
 %{_mandir}/man1/kinit.1*
 %{_mandir}/man1/kdestroy.1*
@@ -575,157 +392,5 @@ rm -f %{buildroot}/%{_libdir}/krb5/plugins/preauth/test.so
 %{_mandir}/man5/.k5login.5.gz
 %{_mandir}/man5/.k5identity.5*
 %{_mandir}/man8/*
-%else
-
-%files -f mit-krb5.lang
-%defattr(-,root,root)
-%dir %{krb5docdir}
-# add plugin directories
-%dir %{_libdir}/krb5
-%dir %{_libdir}/krb5/plugins
-%dir %{_libdir}/krb5/plugins/kdb
-%dir %{_libdir}/krb5/plugins/preauth
-%dir %{_libdir}/krb5/plugins/libkrb5
-%dir %{_libdir}/krb5/plugins/tls
-# add log directory
-%attr(0700,root,root) %dir /var/log/krb5
-%doc %{krb5docdir}/README
-%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/krb5.conf
-%attr(0644,root,root) %config /etc/profile.d/krb5*
-%{_libdir}/libgssapi_krb5.*
-%{_libdir}/libgssrpc.so.*
-%{_libdir}/libk5crypto.so.*
-%{_libdir}/libkadm5clnt_mit.so.*
-%{_libdir}/libkadm5srv_mit.so.*
-%{_libdir}/libkdb5.so.*
-%{_libdir}/libkrb5.so.*
-%{_libdir}/libkrb5support.so.*
-%{_libdir}/libkrad.so.*
-
-%files server
-%defattr(-,root,root)
-%attr(0700,root,root) %dir /var/log/krb5
-%config(noreplace) %{_sysconfdir}/logrotate.d/krb5-server
-%if 0%{?suse_version} >= 1210
-%{_unitdir}/kadmind.service
-%{_unitdir}/krb5kdc.service
-%{_unitdir}/kpropd.service
-%else
-%{_sysconfdir}/init.d/kadmind
-%{_sysconfdir}/init.d/krb5kdc
-%{_sysconfdir}/init.d/kpropd
-%endif
-%dir %{krb5docdir}
-%dir /usr/lib/mit
-%dir /usr/lib/mit/sbin
-%dir %{_localstatedir}/lib/kerberos/
-%dir %{_localstatedir}/lib/kerberos/krb5kdc
-%dir %{_localstatedir}/lib/kerberos/krb5
-%dir %{_localstatedir}/lib/kerberos/krb5/user
-%dir %{_libdir}/krb5
-%dir %{_libdir}/krb5/plugins
-%dir %{_libdir}/krb5/plugins/kdb
-%dir %{_libdir}/krb5/plugins/tls
-%attr(0600,root,root) %config(noreplace) %{_localstatedir}/lib/kerberos/krb5kdc/kdc.conf
-%attr(0600,root,root) %config(noreplace) %{_localstatedir}/lib/kerberos/krb5kdc/kadm5.acl
-%attr(0600,root,root) %config(noreplace) %{_localstatedir}/lib/kerberos/krb5kdc/kadm5.dict
-%config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/k*
-%{_var}/adm/fillup-templates/sysconfig.*
-/usr/sbin/rc*
-/usr/lib/mit/sbin/kadmin.local
-/usr/lib/mit/sbin/kadmind
-/usr/lib/mit/sbin/kpropd
-/usr/lib/mit/sbin/kproplog
-/usr/lib/mit/sbin/kprop
-/usr/lib/mit/sbin/kdb5_util
-/usr/lib/mit/sbin/krb5kdc
-/usr/lib/mit/sbin/gss-server
-/usr/lib/mit/sbin/sim_server
-/usr/lib/mit/sbin/sserver
-/usr/lib/mit/sbin/uuserver
-%{_libdir}/krb5/plugins/kdb/db2.so
-%{_libdir}/krb5/plugins/tls/*.so
-%{_mandir}/man5/kdc.conf.5*
-%{_mandir}/man5/kadm5.acl.5*
-%{_mandir}/man8/kadmind.8*
-%{_mandir}/man8/kadmin.local.8*
-%{_mandir}/man8/kpropd.8*
-%{_mandir}/man8/kprop.8*
-%{_mandir}/man8/kproplog.8.gz
-%{_mandir}/man8/kdb5_util.8*
-%{_mandir}/man8/krb5kdc.8*
-%{_mandir}/man8/sserver.8*
-
-%files client
-%defattr(-,root,root)
-%dir /usr/lib/mit
-%dir /usr/lib/mit/bin
-%dir /usr/lib/mit/sbin
-/usr/lib/mit/bin/kvno
-/usr/lib/mit/bin/kinit
-/usr/lib/mit/bin/kdestroy
-/usr/lib/mit/bin/kpasswd
-/usr/lib/mit/bin/klist
-/usr/lib/mit/bin/kadmin
-/usr/lib/mit/bin/ktutil
-/usr/lib/mit/bin/k5srvutil
-/usr/lib/mit/bin/gss-client
-/usr/lib/mit/bin/ksu
-/usr/lib/mit/bin/sclient
-/usr/lib/mit/bin/sim_client
-/usr/lib/mit/bin/uuclient
-/usr/lib/mit/bin/kswitch
-/usr/bin/kinit
-/usr/bin/klist
-%{_mandir}/man1/kvno.1*
-%{_mandir}/man1/kinit.1*
-%{_mandir}/man1/kdestroy.1*
-%{_mandir}/man1/kpasswd.1*
-%{_mandir}/man1/klist.1*
-%{_mandir}/man1/kadmin.1*
-%{_mandir}/man1/ktutil.1*
-%{_mandir}/man1/k5srvutil.1*
-%{_mandir}/man1/kswitch.1*
-%{_mandir}/man5/krb5.conf.5*
-%{_mandir}/man5/.k5login.5*
-%{_mandir}/man5/.k5identity.5*
-%{_mandir}/man5/k5identity.5*
-%{_mandir}/man5/k5login.5*
-%{_mandir}/man1/ksu.1.gz
-%{_mandir}/man1/sclient.1.gz
-
-%files plugin-kdb-ldap
-%defattr(-,root,root)
-%dir %{_libdir}/krb5
-%dir %{_libdir}/krb5/plugins
-%dir %{_libdir}/krb5/plugins/kdb
-%dir /usr/lib/mit/sbin/
-%dir %{krb5docdir}
-%doc %{krb5docdir}/kerberos.schema
-%doc %{krb5docdir}/kerberos.ldif
-%{_libdir}/krb5/plugins/kdb/kldap.so
-/usr/lib/mit/sbin/kdb5_ldap_util
-%{_libdir}/libkdb_ldap*
-%{_mandir}/man8/kdb5_ldap_util.8*
-
-%files plugin-preauth-pkinit
-%defattr(-,root,root)
-%dir %{_libdir}/krb5
-%dir %{_libdir}/krb5/plugins
-%dir %{_libdir}/krb5/plugins/preauth
-%{_libdir}/krb5/plugins/preauth/pkinit.so
-
-%files plugin-preauth-otp
-%defattr(-,root,root)
-%dir %{_libdir}/krb5
-%dir %{_libdir}/krb5/plugins
-%dir %{_libdir}/krb5/plugins/preauth
-%{_libdir}/krb5/plugins/preauth/otp.so
-
-%files doc
-%defattr(-,root,root)
-%doc html doc/CHANGES doc/README
-
-%endif #build_mini
 
 %changelog
diff --git a/krb5.changes b/krb5.changes
index 513f259..5bbbf23 100644
--- a/krb5.changes
+++ b/krb5.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Feb 11 15:06:31 UTC 2016 - hguo@suse.com
+
+- Remove krb5-mini pieces from spec file.
+  Hence remove pre_checkin.sh
+- Remove expired macros and other minor clean-ups in spec file.
+
 -------------------------------------------------------------------
 Tue Feb  2 08:41:13 UTC 2016 - hguo@suse.com
 
diff --git a/krb5.spec b/krb5.spec
index 87bebdc..ddb0217 100644
--- a/krb5.spec
+++ b/krb5.spec
@@ -16,7 +16,6 @@
 #
 
 
-%define build_mini 0
 %define srcRoot krb5-1.14
 %define vendorFiles %{_builddir}/%{srcRoot}/vendor-files/
 %define krb5docdir  %{_defaultdocdir}/krb5
@@ -36,35 +35,22 @@ Summary:        MIT Kerberos5 Implementation--Libraries
 License:        MIT
 Group:          Productivity/Networking/Security
 Obsoletes:      krb5-plugin-preauth-pkinit-nss
-BuildRequires:  libverto-devel
-%if ! 0%{?build_mini}
 BuildRequires:  doxygen
 BuildRequires:  libopenssl-devel
+BuildRequires:  libverto-devel
 BuildRequires:  openldap2-devel
 BuildRequires:  pam-devel
 BuildRequires:  python-Cheetah
 BuildRequires:  python-Sphinx
 BuildRequires:  python-libxml2
 BuildRequires:  python-lxml
-%if 0%{?suse_version} >= 1210
 BuildRequires:  pkgconfig(systemd)
 %{?systemd_requires}
-%else
-PreReq:         %insserv_prereq 
-%endif
 # bug437293
 %ifarch ppc64
 Obsoletes:      krb5-64bit
 %endif
 Conflicts:      krb5-mini
-%else # -mini
-Conflicts:      krb5
-Conflicts:      krb5-client
-Conflicts:      krb5-server
-Conflicts:      krb5-plugin-kdb-ldap
-Conflicts:      krb5-plugin-preauth-pkinit
-Conflicts:      krb5-plugin-preauth-otp
-%endif
 # both tar.gz and .tar.gz.asc extracted from the http://web.mit.edu/kerberos/dist/krb5/1.13/krb5-1.13.2-signed.tar
 Source:         krb5-%{version}.tar.gz
 Source42:       krb5-%version.tar.gz.asc
@@ -98,8 +84,6 @@ Kerberos V5 is a trusted-third-party network authentication system,
 which can improve your network's security by eliminating the insecure
 practice of clear text passwords.
 
-%if ! %{build_mini}
-
 %package client
 Conflicts:      krb5-mini
 Summary:        MIT Kerberos5 implementation - client programs
@@ -166,8 +150,6 @@ system,which can improve your network's security by eliminating the
 insecurepractice of clear text passwords. This package includes
 extended documentation for MIT Kerberos.
 
-%endif #! build_mini
-
 %package devel
 Summary:        MIT Kerberos5 - Include Files and Libraries
 Group:          Development/Libraries/C and C++
@@ -179,13 +161,7 @@ Requires:       libverto-devel
 %ifarch ppc64
 Obsoletes:      krb5-devel-64bit
 %endif
-%if %{build_mini}
-Provides:       krb5-devel = %{version}
-Conflicts:      krb5-devel
-%else
 Conflicts:      krb5-mini-devel
-%endif
-#
 
 %description devel
 Kerberos V5 is a trusted-third-party network authentication system,
@@ -237,26 +213,19 @@ DEFCCNAME=DIR:/run/user/%%{uid}/krb5cc; export DEFCCNAME
 	--disable-static \
         --enable-dns-for-realm \
         --disable-rpath \
-%if ! %{build_mini}
         --with-ldap \
         --with-pam \
         --enable-pkinit \
         --with-pkinit-crypto-impl=openssl \
-%else
-        --disable-pkinit \
-        --without-pam \
-%endif
         --with-selinux \
         --with-system-et \
         --with-system-ss \
         --with-system-verto
 %{__make} %{?_smp_mflags}
-%if ! 0%{?build_mini}
 cd doc
 make %{?jobs:-j%jobs} substhtml
 cp -a html_subst ../../html
 cd ..
-%endif
 
 # Copy kadmin manual page into kadmin.local's due to the split between client and server package
 cp man/kadmin.man man/kadmin.local.8
@@ -350,62 +319,21 @@ ln -sf ../../usr/lib/mit/bin/klist   %{buildroot}/usr/bin/klist
 # install doc
 install -d -m 755 %{buildroot}/%{krb5docdir}
 install -m 644 %{_builddir}/%{srcRoot}/README %{buildroot}/%{krb5docdir}/README
-%if ! %{build_mini}
 install -m 644 %{_builddir}/%{srcRoot}/src/plugins/kdb/ldap/libkdb_ldap/kerberos.schema %{buildroot}/%{krb5docdir}/kerberos.schema
 install -m 644 %{_builddir}/%{srcRoot}/src/plugins/kdb/ldap/libkdb_ldap/kerberos.ldif %{buildroot}/%{krb5docdir}/kerberos.ldif
-%endif
 # cleanup
 rm -f  %{buildroot}/usr/share/man/man1/tmac.doc*
 rm -f  /usr/share/man/man1/tmac.doc*
 rm -rf %{buildroot}/usr/lib/mit/share/examples
-%if %{build_mini}
-# manually remove otp plugin for krb5-mini since configure
-# doesn't support disabling it at build time
-rm -f %{buildroot}/%{_libdir}/krb5/plugins/preauth/otp.so
-%endif
 # manually remove test plugin since configure doesn't support disabling it at build time
 rm -f %{buildroot}/%{_libdir}/krb5/plugins/preauth/test.so
 
 %find_lang mit-krb5
 
 #####################################################
-# krb5(-mini) pre/post/postun
+# krb5 pre/post/postun
 #####################################################
 
-%if %{build_mini}
-
-%preun
-%if 0%{?suse_version} >= 1210
-%service_del_preun krb5kdc.service kadmind.service kpropd.service
-%else
-%stop_on_removal krb5kdc kadmind kpropd
-%endif
-
-%postun
-/sbin/ldconfig
-%if 0%{?suse_version} >= 1210
-%service_del_postun krb5kdc.service kadmind.service kpropd.service
-%else
-%restart_on_update krb5kdc kadmind kpropd
-%{insserv_cleanup}
-%endif
-
-%post 
-/sbin/ldconfig
-%if 0%{?suse_version} >= 1210
-%service_add_post krb5kdc.service kadmind.service kpropd.service
-%endif
-%{fillup_only -n kadmind}
-%{fillup_only -n krb5kdc}
-%{fillup_only -n kpropd}
-
-%pre
-%if 0%{?suse_version} >= 1210
-%service_add_pre krb5kdc.service kadmind.service kpropd.service
-%endif
-
-%else
-
 %post -p /sbin/ldconfig
 
 %postun
@@ -416,32 +344,19 @@ rm -f %{buildroot}/%{_libdir}/krb5/plugins/preauth/test.so
 #####################################################
 
 %preun server
-%if 0%{?suse_version} >= 1210
 %service_del_preun krb5kdc.service kadmind.service kpropd.service
-%else
-%stop_on_removal krb5kdc kadmind kpropd
-%endif
 
 %postun server
-%if 0%{?suse_version} >= 1210
 %service_del_postun krb5kdc.service kadmind.service kpropd.service
-%else
-%restart_on_update krb5kdc kadmind kpropd
-%{insserv_cleanup}
-%endif
 
 %post server
-%if 0%{?suse_version} >= 1210
 %service_add_post krb5kdc.service kadmind.service kpropd.service
-%endif
 %{fillup_only -n kadmind}
 %{fillup_only -n krb5kdc}
 %{fillup_only -n kpropd}
 
 %pre server
-%if 0%{?suse_version} >= 1210
 %service_add_pre krb5kdc.service kadmind.service kpropd.service
-%endif
 
 #####################################################
 # krb5-plugin-kdb-ldap post/postun
@@ -452,8 +367,6 @@ rm -f %{buildroot}/%{_libdir}/krb5/plugins/preauth/test.so
 %postun plugin-kdb-ldap
 /sbin/ldconfig
 
-%endif
-
 ########################################################
 # files sections
 ########################################################
@@ -489,100 +402,6 @@ rm -f %{buildroot}/%{_libdir}/krb5/plugins/preauth/test.so
 %{_mandir}/man1/krb5-config.1*
 %{_datadir}/aclocal/ac_check_krb5.m4
 
-%if %{build_mini}
-
-%files -f mit-krb5.lang
-%defattr(-,root,root)
-%dir %{krb5docdir}
-# add directories
-%dir %{_libdir}/krb5
-%dir %{_libdir}/krb5/plugins
-%dir %{_libdir}/krb5/plugins/kdb
-%dir %{_libdir}/krb5/plugins/preauth
-%dir %{_libdir}/krb5/plugins/libkrb5
-%dir %{_libdir}/krb5/plugins/tls
-%dir %{_localstatedir}/lib/kerberos/
-%dir %{_localstatedir}/lib/kerberos/krb5kdc
-%dir %{_localstatedir}/lib/kerberos/krb5
-%dir %{_localstatedir}/lib/kerberos/krb5/user
-%attr(0700,root,root) %dir /var/log/krb5
-%dir /usr/lib/mit
-%dir /usr/lib/mit/sbin
-%dir /usr/lib/mit/bin
-%doc %{krb5docdir}/README
-%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/krb5.conf
-%attr(0644,root,root) %config /etc/profile.d/krb5*
-%config(noreplace) %{_sysconfdir}/logrotate.d/krb5-server
-%attr(0600,root,root) %config(noreplace) %{_localstatedir}/lib/kerberos/krb5kdc/kdc.conf
-%attr(0600,root,root) %config(noreplace) %{_localstatedir}/lib/kerberos/krb5kdc/kadm5.acl
-%attr(0600,root,root) %config(noreplace) %{_localstatedir}/lib/kerberos/krb5kdc/kadm5.dict
-%config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/k*
-%{_var}/adm/fillup-templates/sysconfig.*
-%if 0%{?suse_version} >= 1210
-%{_unitdir}/kadmind.service
-%{_unitdir}/krb5kdc.service
-%{_unitdir}/kpropd.service
-%else
-%{_sysconfdir}/init.d/*
-%endif
-%{_libdir}/libgssapi_krb5.*
-%{_libdir}/libgssrpc.so.*
-%{_libdir}/libk5crypto.so.*
-%{_libdir}/libkadm5clnt_mit.so.*
-%{_libdir}/libkadm5srv_mit.so.*
-%{_libdir}/libkdb5.so.*
-%{_libdir}/libkrb5.so.*
-%{_libdir}/libkrb5support.so.*
-%{_libdir}/libkrad.so.*
-%{_libdir}/krb5/plugins/kdb/*
-%{_libdir}/krb5/plugins/tls/*
-#/usr/lib/mit/sbin/*
-/usr/lib/mit/sbin/kadmin.local
-/usr/lib/mit/sbin/kadmind
-/usr/lib/mit/sbin/kpropd
-/usr/lib/mit/sbin/kproplog
-/usr/lib/mit/sbin/kprop
-/usr/lib/mit/sbin/kdb5_util
-/usr/lib/mit/sbin/krb5kdc
-/usr/lib/mit/sbin/uuserver
-/usr/lib/mit/sbin/sserver
-/usr/lib/mit/sbin/gss-server
-/usr/lib/mit/sbin/sim_server
-/usr/lib/mit/bin/k5srvutil
-/usr/lib/mit/bin/kvno
-/usr/lib/mit/bin/kinit
-/usr/lib/mit/bin/kdestroy
-/usr/lib/mit/bin/kpasswd
-/usr/lib/mit/bin/klist
-/usr/lib/mit/bin/kadmin
-/usr/lib/mit/bin/ktutil
-/usr/lib/mit/bin/kswitch
-%attr(0755,root,root) /usr/lib/mit/bin/ksu
-/usr/lib/mit/bin/uuclient
-/usr/lib/mit/bin/sclient
-/usr/lib/mit/bin/gss-client
-/usr/lib/mit/bin/sim_client
-/usr/bin/kinit
-/usr/bin/klist
-/usr/sbin/rc*
-#%{_mandir}/man1/*
-%{_mandir}/man1/kvno.1*
-%{_mandir}/man1/kinit.1*
-%{_mandir}/man1/kdestroy.1*
-%{_mandir}/man1/kpasswd.1*
-%{_mandir}/man1/klist.1*
-%{_mandir}/man1/ksu.1*
-%{_mandir}/man1/sclient.1*
-%{_mandir}/man1/kadmin.1*
-%{_mandir}/man1/ktutil.1*
-%{_mandir}/man1/k5srvutil.1*
-%{_mandir}/man1/kswitch.1*
-%{_mandir}/man5/*
-%{_mandir}/man5/.k5login.5.gz
-%{_mandir}/man5/.k5identity.5*
-%{_mandir}/man8/*
-%else
-
 %files -f mit-krb5.lang
 %defattr(-,root,root)
 %dir %{krb5docdir}
@@ -732,6 +551,4 @@ rm -f %{buildroot}/%{_libdir}/krb5/plugins/preauth/test.so
 %defattr(-,root,root)
 %doc html doc/CHANGES doc/README
 
-%endif #build_mini
-
 %changelog
diff --git a/pre_checkin.sh b/pre_checkin.sh
deleted file mode 100644
index 441ce6d..0000000
--- a/pre_checkin.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-sed -e 's/Name:.*/Name:           krb5-mini/g;' \
-    -e 's/spec file for package.*/&-mini/' \
-    -e 's/%define.*build_mini.*/%define build_mini 1/g' krb5.spec > krb5-mini.spec
-cp krb5.changes krb5-mini.changes
-