diff --git a/configure.ac b/configure.ac
index d11ec2b..d78babf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -18,6 +18,13 @@ AC_PROG_CXX
 AM_PROG_LIBTOOL
 AC_LIBTOOL_CXX
 
+AC_CONFIG_HEADER(config.h)
+
+AC_CONFIG_FILES(
+ [Makefile
+  neercs/Makefile
+])
+
 dnl
 dnl  Inherit all Lol Engine checks
 dnl
@@ -51,10 +58,5 @@ dnl
 dnl  Perform the actual commands
 dnl
 
-AC_CONFIG_FILES(
- [Makefile
-  neercs/Makefile
-])
-
 AC_OUTPUT
 
diff --git a/lol b/lol
index e27698f..37c8949 160000
--- a/lol
+++ b/lol
@@ -1 +1 @@
-Subproject commit e27698f8ec9a606b6a012f9d33392790905f3728
+Subproject commit 37c8949b4064b56943c1db0b161426c6cbc35c52
diff --git a/neercs/neercs.cpp b/neercs/neercs.cpp
index eba3b1b..2318033 100644
--- a/neercs/neercs.cpp
+++ b/neercs/neercs.cpp
@@ -51,7 +51,7 @@ Neercs::~Neercs()
 
 int main(int argc, char **argv)
 {
-    System::Init(argc, argv);
+    sys::init(argc, argv);
 
     Application app("Neercs", ivec2(800, 600), 60.0f);