diff --git a/bootstrap b/bootstrap
index de08f74..3c86f2f 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1,8 +1,8 @@
 #!/bin/sh
 
-# Bootstrap Lol Engine first
-(cd lol && ./bootstrap)
-
-# Then bootstrap this project, using the same script
+# Bootstrap this project first, using the Lol Engine script
 ./lol/bootstrap
 
+# Then bootstrap Lol Engine itself
+(cd lol && ./bootstrap)
+
diff --git a/configure.ac b/configure.ac
index 6f9af6f..f43a1ee 100644
--- a/configure.ac
+++ b/configure.ac
@@ -18,32 +18,20 @@ AC_PROG_CXX
 AM_PROG_LIBTOOL
 AC_LIBTOOL_CXX
 
-dnl
-dnl  Build and configure Lol Engine before our repository
-dnl  Ensure $lol_srcdir and $lol_builddir are properly set up
-dnl
-
-ac_configure_args="${ac_configure_args} --disable-test --disable-doc --disable-tutorial --disable-samples"
-AC_CONFIG_SUBDIRS([lol])
-AC_SUBST(lol_srcdir, '${top_srcdir}/lol')
-AC_SUBST(lol_builddir, '${top_builddir}/lol')
+AC_CONFIG_FILES(
+ [Makefile
+  roflmao/Makefile
+])
 
 dnl
 dnl  Inherit all Lol Engine checks
 dnl
 
-LOL_AC_INIT()
-LOL_AC_CHECK()
-LOL_AC_SUBST()
+LOL_AC_SUBPROJECT()
 
 dnl
-dnl  Export automake variables and write makefiles
+dnl  Perform the actual commands
 dnl
 
-AC_CONFIG_FILES(
- [Makefile
-  roflmao/Makefile
-])
-
 AC_OUTPUT
 
diff --git a/lol b/lol
index 8b4976b..cfef38e 160000
--- a/lol
+++ b/lol
@@ -1 +1 @@
-Subproject commit 8b4976b5440b6f374e90e0ab3b433e7cfa6d8efc
+Subproject commit cfef38eb4478b7e0c21c92c37da12b6399bd5be4