diff --git a/ypserv-2.21-path.patch b/ypserv-2.21-path.patch
index 499e940..e0e65c0 100644
--- a/ypserv-2.21-path.patch
+++ b/ypserv-2.21-path.patch
@@ -1,12 +1,12 @@
-diff -up ypserv-2.21/scripts/Makefile.in.path ypserv-2.21/scripts/Makefile.in
---- ypserv-2.21/scripts/Makefile.in.path	2009-06-12 11:32:02.000000000 +0200
-+++ ypserv-2.21/scripts/Makefile.in	2010-01-13 16:09:15.056375015 +0100
-@@ -168,7 +168,7 @@ AUTOMAKE_OPTIONS = 1.7 gnits
- #
- CLEANFILES = *~ ${SCRIPTS}
+diff -up ypserv-2.26/scripts/Makefile.am.path ypserv-2.26/scripts/Makefile.am
+--- ypserv-2.26/scripts/Makefile.am.path	2012-01-12 15:46:16.868219281 +0100
++++ ypserv-2.26/scripts/Makefile.am	2012-01-12 15:46:34.786218054 +0100
+@@ -8,7 +8,7 @@ CLEANFILES = *~ ${SCRIPTS}
+ 
  EXTRA_DIST = ${MANS} ${XMLS}
+ 
 -varypdir = /var/yp
-+varypdir = ${prefix}/../var/yp
++varypdir = $(prefix)/../var/yp
+ 
  man_MANS = pwupdate.8 ypinit.8
  XMLS = pwupdate.8.xml ypinit.8.xml
- libexec_SCRIPTS = ypxfr_1perhour ypxfr_1perday ypxfr_2perday \
diff --git a/ypserv-2.24-aliases.patch b/ypserv-2.24-aliases.patch
index 255ab3e..0267f4a 100644
--- a/ypserv-2.24-aliases.patch
+++ b/ypserv-2.24-aliases.patch
@@ -1,12 +1,34 @@
-diff -up ypserv-2.24/configure.in.aliases ypserv-2.24/configure.in
---- ypserv-2.24/configure.in.aliases	2011-05-06 11:57:05.745509195 +0200
-+++ ypserv-2.24/configure.in	2011-05-06 11:57:16.327509192 +0200
+diff -up ypserv-2.26/acinclude.m4.aliases ypserv-2.26/acinclude.m4
+--- ypserv-2.26/acinclude.m4.aliases	2012-01-12 15:49:32.325205914 +0100
++++ ypserv-2.26/acinclude.m4	2012-01-12 15:50:07.570203506 +0100
+@@ -92,3 +92,18 @@ AC_DEFUN([TYPE_SOCKLEN_T],
+     AC_DEFINE([socklen_t], [int], [Define if socklen_t is missing])
+   fi
+ ])
++
++
++dnl
++dnl Find where aliases file is located
++dnl It can be in /etc/aliases or /etc/mail/aliases
++dnl If file path is specified in argument and file path exists, it is used.
++dnl 
++AC_DEFUN([FIND_ALIASES_PATH], [
++AC_MSG_CHECKING(for aliases file path)
++tmp_aliases="$1"
++test -f /etc/mail/aliases && tmp_aliases="/etc/mail/aliases"
++test -f /etc/aliases && tmp_aliases="/etc/aliases"
++AC_MSG_RESULT($tmp_aliases)
++AC_SUBST(ALIASES, $tmp_aliases)
++])
+diff -up ypserv-2.26/configure.in.aliases ypserv-2.26/configure.in
+--- ypserv-2.26/configure.in.aliases	2012-01-12 15:48:52.068208666 +0100
++++ ypserv-2.26/configure.in	2012-01-12 15:49:17.842206905 +0100
 @@ -149,7 +149,7 @@ fi
  AC_SUBST(MAKE)
  
  dnl Check for aliases path
 -AC_PATH_PROG(ALIASES, aliases, /etc/mail/aliases, /etc/mail:/etc)
-+AC_PATH_PROG(ALIASES, aliases, /etc/aliases, /etc/mail:/etc)
++FIND_ALIASES_PATH(/etc/aliases)
  
  
  
diff --git a/ypserv.spec b/ypserv.spec
index 4fe5831..f0adbb5 100644
--- a/ypserv.spec
+++ b/ypserv.spec
@@ -75,6 +75,8 @@ machines.
 %patch14 -p1 -b .emptydomain
 %patch15 -p1 -b .retval
 
+autoreconf
+
 %build
 cp etc/README etc/README.etc
 %ifarch s390 s390x
@@ -177,7 +179,10 @@ exit 0
 
 %changelog
 * Thu Jan 12 2012 Honza Horak <hhorak@redhat.com> - 2.26-10
-- Respect NISDOMAIN environment variable and set domainname if empty
+- Added ypserv-pre-setdomain to respect NISDOMAIN environment variable 
+  and set domainname if empty
+- Added autoreconf call (thus .path patch modified to keep impact)
+- Patch .aliases fixed
   Resolves: #699826
 
 * Mon Dec 12 2011 Honza Horak <hhorak@redhat.com> - 2.26-9