diff --git a/util-linux-addpart-use-atoll.patch b/util-linux-addpart-use-atoll.patch
new file mode 100644
index 0000000..35310a9
--- /dev/null
+++ b/util-linux-addpart-use-atoll.patch
@@ -0,0 +1,15 @@
+Index: util-linux-ng-2.17.2/partx/addpart.c
+===================================================================
+--- util-linux-ng-2.17.2.orig/partx/addpart.c	2010-01-28 15:57:59.000000000 +0100
++++ util-linux-ng-2.17.2/partx/addpart.c	2010-05-11 15:51:26.000000000 +0200
+@@ -25,8 +25,8 @@ main(int argc, char **argv){
+ 		exit(1);
+ 	}
+ 	p.pno = atoi(argv[2]);
+-	p.start = 512 * ((long long) atol(argv[3]));
+-	p.length = 512 * ((long long) atol(argv[4]));
++	p.start = 512 * atoll(argv[3]);
++	p.length = 512 * atoll(argv[4]);
+ 	p.devname[0] = 0;
+ 	p.volname[0] = 0;
+ 	a.op = BLKPG_ADD_PARTITION;
diff --git a/util-linux.changes b/util-linux.changes
index bae4c63..fb9e43f 100644
--- a/util-linux.changes
+++ b/util-linux.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue May 11 13:58:49 UTC 2010 - puzel@novell.com
+
+- add util-linux-addpart-use-atoll.patch (bnc#603328) 
+
 -------------------------------------------------------------------
 Tue Apr  6 13:22:37 UTC 2010 - hvogel@novell.com
 
diff --git a/util-linux.spec b/util-linux.spec
index 370a784..32676c3 100644
--- a/util-linux.spec
+++ b/util-linux.spec
@@ -27,7 +27,7 @@ License:        GPLv2+
 Group:          System/Base
 AutoReqProv:    on
 Version:        2.17.2
-Release:        1
+Release:        2
 Recommends:     %name-lang = %{version}
 Summary:        A collection of basic system utilities
 Source:         ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v%{version}/%name-ng-%{version}.tar.bz2
@@ -71,6 +71,8 @@ Patch2:         util-linux-2.14.1-mount_skip_sync.patch
 # crypto patch
 Patch3:         util-linux-2.17.1-mount_losetup_crypto.patch
 Patch4:         util-linux-2.17.1-losetup-honor-documented-c-option
+# 603328
+Patch5:         util-linux-addpart-use-atoll.patch
 ##
 ## adjtimex
 ##
@@ -159,6 +161,7 @@ unique IDs (UUIDs).
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 #
 cd adjtimex-*
 %patch50 -p1