diff --git a/.cvsignore b/.cvsignore
index f16e155..ee2dc0f 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1 @@
-names.c
 star-1.5.tar.bz2
diff --git a/sources b/sources
index dd722df..bbb9439 100644
--- a/sources
+++ b/sources
@@ -1,3 +1 @@
 a7b1a5e830935cc1bf1001a558c7f8c4  star-1.5.tar.bz2
-2ec266cafd989a1160ecbcada1de839b  names.c
-
diff --git a/star-1.5-removenames_c.patch b/star-1.5-removenames_c.patch
new file mode 100644
index 0000000..0ebb221
--- /dev/null
+++ b/star-1.5-removenames_c.patch
@@ -0,0 +1,60 @@
+diff -urNp star-1.5-orig/star/cpio.mk star-1.5/star/cpio.mk
+--- star-1.5-orig/star/cpio.mk	2009-01-28 09:46:18.000000000 +0100
++++ star-1.5/star/cpio.mk	2009-01-28 09:47:00.000000000 +0100
+@@ -25,7 +25,7 @@ CFILES=		cpio.c header.c cpiohdr.c xhead
+ 		list.c extract.c create.c append.c diff.c restore.c \
+ 		remove.c star_unix.c acl_unix.c acltext.c fflags.c \
+ 		buffer.c dirtime.c lhash.c \
+-		hole.c longnames.c names.c \
++		hole.c longnames.c \
+ 		movearch.c table.c props.c \
+ 		unicode.c \
+ 		subst.c volhdr.c \
+diff -urNp star-1.5-orig/star/gnutar.mk star-1.5/star/gnutar.mk
+--- star-1.5-orig/star/gnutar.mk	2009-01-28 09:46:18.000000000 +0100
++++ star-1.5/star/gnutar.mk	2009-01-28 09:47:13.000000000 +0100
+@@ -25,7 +25,7 @@ CFILES=		gnutar.c header.c cpiohdr.c xhe
+ 		list.c extract.c create.c append.c diff.c restore.c \
+ 		remove.c star_unix.c acl_unix.c acltext.c fflags.c \
+ 		buffer.c dirtime.c lhash.c \
+-		hole.c longnames.c names.c \
++		hole.c longnames.c \
+ 		movearch.c table.c props.c \
+ 		unicode.c \
+ 		subst.c volhdr.c \
+diff -urNp star-1.5-orig/star/pax.mk star-1.5/star/pax.mk
+--- star-1.5-orig/star/pax.mk	2009-01-28 09:46:18.000000000 +0100
++++ star-1.5/star/pax.mk	2009-01-28 09:47:32.000000000 +0100
+@@ -26,7 +26,7 @@ CFILES=		pax.c header.c cpiohdr.c xheade
+ 		list.c extract.c create.c append.c diff.c restore.c \
+ 		remove.c star_unix.c acl_unix.c acltext.c fflags.c \
+ 		buffer.c dirtime.c lhash.c \
+-		hole.c longnames.c names.c \
++		hole.c longnames.c \
+ 		movearch.c table.c props.c \
+ 		unicode.c \
+ 		subst.c volhdr.c \
+diff -urNp star-1.5-orig/star/star.mk star-1.5/star/star.mk
+--- star-1.5-orig/star/star.mk	2009-01-28 09:46:18.000000000 +0100
++++ star-1.5/star/star.mk	2009-01-28 09:49:05.000000000 +0100
+@@ -26,7 +26,7 @@ CFILES=		star.c header.c cpiohdr.c xhead
+ 		list.c extract.c create.c append.c diff.c restore.c \
+ 		remove.c star_unix.c acl_unix.c acltext.c fflags.c \
+ 		buffer.c dirtime.c lhash.c \
+-		hole.c longnames.c names.c \
++		hole.c longnames.c \
+ 		movearch.c table.c props.c \
+ 		unicode.c \
+ 		subst.c volhdr.c \
+diff -urNp star-1.5-orig/star/suntar.mk star-1.5/star/suntar.mk
+--- star-1.5-orig/star/suntar.mk	2009-01-28 09:46:18.000000000 +0100
++++ star-1.5/star/suntar.mk	2009-01-28 09:51:01.000000000 +0100
+@@ -25,7 +25,7 @@ CFILES=		suntar.c header.c cpiohdr.c xhe
+ 		list.c extract.c create.c append.c diff.c restore.c \
+ 		remove.c star_unix.c acl_unix.c acltext.c fflags.c \
+ 		buffer.c dirtime.c lhash.c \
+-		hole.c longnames.c names.c \
++		hole.c longnames.c \
+ 		movearch.c table.c props.c \
+ 		unicode.c \
+ 		subst.c volhdr.c \
diff --git a/star.spec b/star.spec
index d7bace2..9b09d50 100644
--- a/star.spec
+++ b/star.spec
@@ -4,14 +4,13 @@
 Summary:  An archiving tool with ACL support
 Name: star
 Version: 1.5
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://cdrecord.berlios.de/old/private/star.html
 Source: ftp://ftp.berlios.de/pub/star/%{name}-%{version}.tar.bz2
-#names.c dissapeared from upstream tarball, but is necessary for build
-Source1: names.c
 Patch1: star-1.5-newMake.patch
 Patch2: star-1.5-selinux.patch
 Patch3: star-1.5-changewarnSegv.patch
+Patch4: star-1.5-removenames_c.patch
 License: CDDL
 Group: Applications/Archiving
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@ -29,8 +28,7 @@ and can restore individual files from the archive. Star supports ACL.
 %patch2 -p1 -b .selinux
 %endif
 %patch3 -p1 -b .changewarnSegv
-cp -a %{SOURCE1} ./libfind/
-cp -a %{SOURCE1} ./star/
+%patch4 -p1 -b .removenames
 
 for PLAT in %{arm} x86_64 ppc64 s390 s390x sh3 sh4 sh4a sparcv9; do
         for AFILE in gcc cc; do
@@ -102,6 +100,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_mandir}/man1/spax.1*
 
 %changelog
+* Wed Jan 28 2009 Ondrej Vasik <ovasik@redhat.com> 1.5-2
+- remove names.c requirements from non-fat Makefiles,
+  do not ship names.c (#255261 for details)
 * Tue Jan 27 2009 Ondrej Vasik <ovasik@redhat.com> 1.5-1
 - use final instead of beta
 - ship missing names.c separately