diff --git a/src/core/misc.c b/src/core/misc.c
index 799693577..8f56e1fb4 100644
--- a/src/core/misc.c
+++ b/src/core/misc.c
@@ -37,30 +37,10 @@ unsigned long strtoul ( const char *p, char **endp, int base ) {
 	unsigned long ret = 0;
 	unsigned int charval;
 
-	while ( isspace ( *p ) )
-		p++;
-
-	if ( base == 0 ) {
-		base = 10;
-		if ( *p == '0' ) {
-			p++;
-			base = 8;
-			if ( ( *p | 0x20 ) == 'x' ) {
-				p++;
-				base = 16;
-			}
-		}
-	}
+	base = strtoul_base ( &p, base );
 
 	while ( 1 ) {
-		charval = *p;
-		if ( charval >= 'a' ) {
-			charval = ( charval - 'a' + 10 );
-		} else if ( charval >= 'A' ) {
-			charval = ( charval - 'A' + 10 );
-		} else if ( charval <= '9' ) {
-			charval = ( charval - '0' );
-		}
+		charval = strtoul_charval ( *p );
 		if ( charval >= ( unsigned int ) base )
 			break;
 		ret = ( ( ret * base ) + charval );
diff --git a/src/core/strtoull.c b/src/core/strtoull.c
new file mode 100644
index 000000000..b1ceeb45b
--- /dev/null
+++ b/src/core/strtoull.c
@@ -0,0 +1,48 @@
+/*
+ * Copyright (C) 2006 Michael Brown <mbrown@fensystems.co.uk>
+ * Copyright (C) 2010 Piotr Jaroszyński <p.jaroszynski@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+FILE_LICENCE ( GPL2_OR_LATER );
+
+#include <stdlib.h>
+#include <ctype.h>
+
+/*
+ * Despite being exactly the same as strtoul() except the long long instead of
+ * long it ends up being much bigger so provide a separate implementation in a
+ * separate object so that it won't be linked in if not used.
+ */
+unsigned long long strtoull ( const char *p, char **endp, int base ) {
+	unsigned long long ret = 0;
+	unsigned int charval;
+
+	base = strtoul_base ( &p, base );
+
+	while ( 1 ) {
+		charval = strtoul_charval ( *p );
+		if ( charval >= ( unsigned int ) base )
+			break;
+		ret = ( ( ret * base ) + charval );
+		p++;
+	}
+
+	if ( endp )
+		*endp = ( char * ) p;
+
+	return ( ret );
+}
diff --git a/src/include/stdlib.h b/src/include/stdlib.h
index 254e39b3a..19a7c8e09 100644
--- a/src/include/stdlib.h
+++ b/src/include/stdlib.h
@@ -5,6 +5,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
 
 #include <stdint.h>
 #include <assert.h>
+#include <ctype.h>
 
 /*****************************************************************************
  *
@@ -13,7 +14,46 @@ FILE_LICENCE ( GPL2_OR_LATER );
  ****************************************************************************
  */
 
+static inline int strtoul_base ( const char **pp, int base )
+{
+	const char *p = *pp;
+
+	while ( isspace ( *p ) )
+		p++;
+
+	if ( base == 0 ) {
+		base = 10;
+		if ( *p == '0' ) {
+			p++;
+			base = 8;
+			if ( ( *p | 0x20 ) == 'x' ) {
+				p++;
+				base = 16;
+			}
+		}
+	}
+
+	*pp = p;
+
+	return base;
+}
+
+static inline unsigned int strtoul_charval ( unsigned int charval )
+{
+	if ( charval >= 'a' ) {
+		charval = ( charval - 'a' + 10 );
+	} else if ( charval >= 'A' ) {
+		charval = ( charval - 'A' + 10 );
+	} else if ( charval <= '9' ) {
+		charval = ( charval - '0' );
+	}
+
+	return charval;
+}
+
 extern unsigned long strtoul ( const char *p, char **endp, int base );
+extern unsigned long long strtoull ( const char *p, char **endp, int base );
+
 
 /*****************************************************************************
  *