diff --git a/README b/README
index e6a8eeae..3e541201 100644
--- a/README
+++ b/README
@@ -127,17 +127,9 @@ that can be enabled if the functionality is required:
 		Since the public API of Embedded Linux library  is not yet
 		stable, the usage of the internal ELL copy is preferred.
 
-	--enable-sim-hardcoded
 
-		Enable support for hard coded SIM keys
 
-		Note: With --disable-daemon this option is ignored
 
-	--enable-ofono
-
-		Enable support for oFono SIM authentication
-
-		Note: With --disable-daemon this option is ignored
 
 	--enable-wired
 
@@ -172,6 +164,18 @@ that can be enabled if the functionality is required:
 		This enables building of all utilities that are however
 		not installed and only useful during development.
 
+	--enable-ofono
+
+		Enable support for oFono SIM authentication
+
+		Note: With --disable-daemon this option is ignored
+
+	--enable-sim-hardcoded
+
+		Enable support for hard coded SIM keys
+
+		Note: With --disable-daemon this option is ignored
+
 	--enable-docs
 
 		Enable generation of documentation and manual pages
diff --git a/bootstrap-configure b/bootstrap-configure
index 4ca06002..195f2e48 100755
--- a/bootstrap-configure
+++ b/bootstrap-configure
@@ -9,10 +9,10 @@ fi
 		--enable-debug \
 		--prefix=/usr \
 		--localstatedir=/var \
-		--enable-sim-hardcoded \
-		--enable-ofono \
 		--enable-wired \
 		--enable-hwsim \
 		--enable-tools \
+		--enable-ofono \
+		--enable-sim-hardcoded \
 		--disable-dbus-policy \
 		--disable-systemd-service $*
diff --git a/configure.ac b/configure.ac
index db56296f..43f8eb23 100644
--- a/configure.ac
+++ b/configure.ac
@@ -244,15 +244,6 @@ if (test "${enable_external_ell}" = "yes"); then
 fi
 AM_CONDITIONAL(EXTERNAL_ELL, test "${enable_external_ell}" = "yes")
 
-AC_ARG_ENABLE([sim_hardcoded], AC_HELP_STRING([--enable-sim-hardcoded],
-				[enable hard coded SIM keys]),
-					[enable_sim_hardcoded=${enableval}])
-AM_CONDITIONAL(SIM_HARDCODED, test "${enable_sim_hardcoded}" = "yes")
-
-AC_ARG_ENABLE([ofono], AC_HELP_STRING([--enable-ofono],
-				[enable oFono SIM authentication support]),
-					[enable_ofono=${enableval}])
-AM_CONDITIONAL(OFONO, test "${enable_ofono}" = "yes")
 
 AC_ARG_ENABLE([wired], AC_HELP_STRING([--enable-wired],
 				[enable Ethernet authentication support]),
@@ -269,6 +260,16 @@ AC_ARG_ENABLE([tools], AC_HELP_STRING([--enable-tools],
 					[enable_tools=${enableval}])
 AM_CONDITIONAL(TOOLS, test "${enable_tools}" = "yes")
 
+AC_ARG_ENABLE([ofono], AC_HELP_STRING([--enable-ofono],
+				[enable oFono SIM authentication support]),
+					[enable_ofono=${enableval}])
+AM_CONDITIONAL(OFONO, test "${enable_ofono}" = "yes")
+
+AC_ARG_ENABLE([sim_hardcoded], AC_HELP_STRING([--enable-sim-hardcoded],
+				[enable hard coded SIM keys]),
+					[enable_sim_hardcoded=${enableval}])
+AM_CONDITIONAL(SIM_HARDCODED, test "${enable_sim_hardcoded}" = "yes")
+
 AC_ARG_ENABLE([docs], AC_HELP_STRING([--enable-docs],
 				[build documentation and manual pages]),
 					[enable_docs=${enableval}])