diff --git a/postgresql-pgpool-II.spec b/postgresql-pgpool-II.spec
index 67acbcb..b041aa7 100644
--- a/postgresql-pgpool-II.spec
+++ b/postgresql-pgpool-II.spec
@@ -1,8 +1,8 @@
-%define short_name	pgpool-II
+%global short_name	pgpool-II
 %if 0%{?rhel} && 0%{?rhel} <= 6
-%define systemd_enabled 0
+%global systemd_enabled 0
 %else
-%define systemd_enabled 1
+%global systemd_enabled 1
 %endif
 
 %global _varrundir %{_localstatedir}/run/pgpool
@@ -10,7 +10,7 @@
 Summary:		Pgpool is a connection pooling/replication server for PostgreSQL
 Name:			postgresql-%{short_name}
 Version:		3.4.0
-Release:		1%{?dist}
+Release:		2%{?dist}
 License:		BSD
 Group:			Applications/Databases
 URL:			http://pgpool.net
@@ -79,14 +79,14 @@ Postgresql extensions libraries and sql files for pgpool-II.
 %build
 %configure --with-pgsql-includedir=%{_includedir}/pgsql --with-pgsql=%{_libdir}/pgsql --disable-static --with-pam --disable-rpath --sysconfdir=%{_sysconfdir}/%{short_name}/
 
-make %{?_smp_flags}
-( cd src/sql/pgpool-recovery && make %{?_smp_flags} && cd ../../.. )
-( cd src/sql/pgpool-regclass && make %{?_smp_flags} && cd ../../.. )
+make %{?_smp_mflags}
+( cd src/sql/pgpool-recovery && make %{?_smp_mflags} )
+( cd src/sql/pgpool-regclass && make %{?_smp_mflags} )
 
 %install
-make %{?_smp_flags} DESTDIR=%{buildroot} install
-( cd src/sql/pgpool-recovery &&  make %{?_smp_flags} DESTDIR=%{buildroot} install )
-( cd src/sql/pgpool-regclass &&  make %{?_smp_flags} DESTDIR=%{buildroot} install )
+make %{?_smp_mflags} DESTDIR=%{buildroot} install
+( cd src/sql/pgpool-recovery &&  make %{?_smp_mflags} DESTDIR=%{buildroot} install )
+( cd src/sql/pgpool-regclass &&  make %{?_smp_mflags} DESTDIR=%{buildroot} install )
 install -d %{buildroot}%{_datadir}/%{short_name}
 install -d %{buildroot}%{_sysconfdir}/%{short_name}
 mv %{buildroot}/%{_sysconfdir}/%{short_name}/pcp.conf.sample %{buildroot}%{_sysconfdir}/%{short_name}/pcp.conf
@@ -211,12 +211,14 @@ fi
 %{_datadir}/pgsql/extension/pgpool_regclass.control
 # From PostgreSQL 9.4 pgpool-regclass.so is not needed anymore
 # because 9.4 or later has to_regclass.
-# if %{postgresql_major} <= 9.3
-  %{_libdir}/pgsql/pgpool-regclass.so
-# endif
+%{_libdir}/pgsql/pgpool-regclass.so
 
 
 %changelog
+* Fri Nov 21 2014 Pavel Raiskup <praiskup@redhat.com> - 3.4.0-2
+- remove redundant 'cd ../..' in sub-shell, cleanup comments, use %%_smp_mflags,
+  use %%global
+
 * Wed Nov 12 2014 Jozef Mlich <jmlich@redhat.com> - 3.4.0-1
 - update to 3.4.0
   see http://www.pgpool.net/docs/pgpool-II-3.4.0/NEWS.txt