diff --git a/configure.in b/configure.in
index 6c080aa..b16eb5d 100644
--- a/configure.in
+++ b/configure.in
@@ -6,7 +6,7 @@ AM_MAINTAINER_MODE
 
 AM_PROG_CC_STDC
 if test "$GCC" = yes; then
-    CFLAGS="$CFLAGS -pipe -W -Wall -Wshadow -Wstrict-prototypes"
+    CFLAGS="$CFLAGS -pipe -W -Wall -Wshadow -Wstrict-prototypes -ansi -pedantic -Wno-overlength-strings"
 fi
 
 CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
diff --git a/src/drv_imap.c b/src/drv_imap.c
index 875da2d..574e3a4 100644
--- a/src/drv_imap.c
+++ b/src/drv_imap.c
@@ -160,24 +160,24 @@ struct imap_cmd_refcounted {
 
 enum CAPABILITY {
 	NOLOGIN = 0,
-	UIDPLUS,
-	LITERALPLUS,
-	NAMESPACE,
 #ifdef HAVE_LIBSSL
 	CRAM,
 	STARTTLS,
 #endif
+	UIDPLUS,
+	LITERALPLUS,
+	NAMESPACE
 };
 
 static const char *cap_list[] = {
 	"LOGINDISABLED",
-	"UIDPLUS",
-	"LITERAL+",
-	"NAMESPACE",
 #ifdef HAVE_LIBSSL
 	"AUTH=CRAM-MD5",
 	"STARTTLS",
 #endif
+	"UIDPLUS",
+	"LITERAL+",
+	"NAMESPACE"
 };
 
 #define RESP_OK       0
diff --git a/src/mdconvert.c b/src/mdconvert.c
index a6b2ea3..c2fbf25 100644
--- a/src/mdconvert.c
+++ b/src/mdconvert.c
@@ -54,7 +54,7 @@ static const char *subdirs[] = { "cur", "new" };
 static struct flock lck;
 static DBT key, value;
 
-static inline int
+static int
 convert( const char *box, int altmap )
 {
 	DB *db;