diff --git a/configure.in b/configure.in
index 1975ea47..6251a968 100644
--- a/configure.in
+++ b/configure.in
@@ -4,7 +4,7 @@ dnl Process this file with autoconf to produce a configure script.
 AC_INIT(config.h.in)
 
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(mt-daapd,0.2.1)
+AM_INIT_AUTOMAKE(mt-daapd,0.2.1a)
 
 dnl Checks for programs.
 AC_PROG_CC
@@ -58,7 +58,6 @@ AM_CONDITIONAL(COND_OGGVORBIS, test x$use_oggvorbis = xtrue)
 
 AM_CONDITIONAL(COND_NEED_STRCASESTR,false)
 AM_CONDITIONAL(COND_NEED_STRSEP,false)
-AM_CONDITIONAL(COND_NEED_ATOLL,false)
 
 dnl Darwin's stupid cpp preprocessor....
 echo Host type is $host
@@ -198,7 +197,7 @@ fi
 
 AC_REPLACE_FUNCS(strcasestr)
 AC_REPLACE_FUNCS(strsep)
-AC_REPLACE_FUNCS(atoll)
+AC_CHECK_FUNCS(atoll)
 
 dnl Checks for header files.
 AC_HEADER_STDC
diff --git a/src/Makefile.am b/src/Makefile.am
index b2420026..374d467b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -28,7 +28,6 @@ mt_daapd_SOURCES = main.c daapd.h rend.h uici.c uici.h webserver.c \
 	mp3-scanner.h mp3-scanner.c playlist.c playlist.h \
 	rend-unix.h lexer.l parser.y strcasestr.c strcasestr.h strsep.c \
 	redblack.c redblack.h dynamic-art.c dynamic-art.h query.c query.h \
-	atoll.c atoll.h \
 	$(PRENDSRC) $(ORENDSRC) $(HRENDSRC) $(OGGVORBISSRC)
 
 EXTRA_DIST = mDNS.c mDNSClientAPI.h mDNSDebug.h mDNSPosix.c \
diff --git a/src/main.c b/src/main.c
index a6f00ab5..837cfbed 100644
--- a/src/main.c
+++ b/src/main.c
@@ -107,6 +107,12 @@
 
 /** Seconds to sleep before checking for a shutdown or reload */
 #define MAIN_SLEEP_INTERVAL  2
+
+/** Let's hope if you have no atoll, you only have 32 bit inodes... */
+#if !HAVE_ATOLL
+#  define atoll(a) atol(a)
+#endif
+
 /*
  * Globals
  */