diff --git a/configure.ac b/configure.ac
index 8839cb0e..ba489a7d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -470,6 +470,7 @@ AC_CONFIG_FILES(
   people/Makefile
   games/Makefile
   tools/Makefile
+  tools/vslol/Makefile
 ])
 AC_CONFIG_FILES(
  [games/monsterz/Makefile
diff --git a/src/Makefile.am b/src/Makefile.am
index f70547e4..c0d3dece 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -447,7 +447,6 @@ bullet_sources += \
 		bullet/BulletDynamics/ConstraintSolver/btHingeConstraint.h \
 		bullet/BulletDynamics/ConstraintSolver/btHinge2Constraint.h \
 		bullet/BulletDynamics/ConstraintSolver/btUniversalConstraint.h \
-		bullet/BulletDynamics/ConstraintSolver/btSolve2bullet/LinearConstraint.h \
 		bullet/BulletDynamics/Vehicle/btVehicleRaycaster.h \
 		bullet/BulletDynamics/Vehicle/btRaycastVehicle.h \
 		bullet/BulletDynamics/Vehicle/btWheelInfo.h
@@ -500,7 +499,6 @@ bullet_sources += \
 	bullet/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.h \
 	bullet/BulletDynamics/ConstraintSolver/btGeneric6DofSpringConstraint.h \
 	bullet/BulletDynamics/ConstraintSolver/btJacobianEntry.h \
-	bullet/BulletDynamics/ConstraintSolver/btSolve2bullet/LinearConstraint.h \
 	bullet/BulletDynamics/ConstraintSolver/btConeTwistConstraint.h \
 	bullet/BulletDynamics/ConstraintSolver/btHingeConstraint.h \
 	bullet/BulletDynamics/ConstraintSolver/btHinge2Constraint.h \
diff --git a/test/Makefile.am b/test/Makefile.am
index 40716147..1c15047a 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -46,10 +46,12 @@ benchsuite_DEPENDENCIES = $(top_builddir)/src/liblol.a
 btphystest_SOURCES = BtPhysTest.cpp BtPhysTest.h \
     Physics/Src/EasyPhysics.cpp Physics/Include/EasyPhysics.h \
     Physics/Include/LolBtPhysicsIntegration.h Physics/Include/LolPhysics.h \
-    Physics/Src/EasyCharacterController.cpp Physics/Src/EasyConstraint.cpp \
-	Physics/Src/BulletCharacterController.cpp \
-    Physics/Include/EasyCharacterController.h Physics/Include/EasyConstraint.h \
-	Physics/Src/BulletCharacterController.h
+    Physics/Src/EasyCharacterController.cpp \
+    Physics/Include/EasyCharacterController.h \
+    Physics/Src/EasyConstraint.cpp \
+    Physics/Include/EasyConstraint.h \
+    Physics/Src/BulletCharacterController.cpp \
+    Physics/Include/BulletCharacterController.h
 btphystest_CPPFLAGS = @LOL_CFLAGS@ @PIPI_CFLAGS@ -I$(top_builddir)/src/bullet \
     -DHAVE_PHYS_USE_BULLET
 btphystest_LDFLAGS = $(top_builddir)/src/liblol.a @LOL_LIBS@ @PIPI_LIBS@
diff --git a/tools/Makefile.am b/tools/Makefile.am
index d3b483ff..c13defcf 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -3,6 +3,7 @@ include $(top_srcdir)/build/autotools/common.am
 
 SUBDIRS =
 SUBDIRS += neercs
+SUBDIRS += vslol
 
 
 noinst_PROGRAMS = $(make_font)
diff --git a/tools/vslol/Makefile.am b/tools/vslol/Makefile.am
new file mode 100644
index 00000000..a62766df
--- /dev/null
+++ b/tools/vslol/Makefile.am
@@ -0,0 +1,18 @@
+
+include $(top_srcdir)/build/autotools/common.am
+
+EXTRA_DIST = \
+    VsLol.csproj \
+    \
+    VsLol.cs \
+    VsLol.vsct \
+    VsLol.resx \
+    VsLol.Designer.cs \
+    AssemblyInfo.cs \
+    GlobalSuppressions.cs \
+    MenuGenerateCompilers.cs \
+    \
+    source.extension.vsixmanifest \
+    \
+    gear.bmp
+
diff --git a/tools/vslol/VsLol.csproj.user b/tools/vslol/VsLol.csproj.user
deleted file mode 100644
index 19cc2179..00000000
--- a/tools/vslol/VsLol.csproj.user
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
-    <StartAction>Program</StartAction>
-    <StartProgram>C:\Program Files (x86)\Microsoft Visual Studio 10.0\Common7\IDE\devenv.exe</StartProgram>
-    <StartArguments>/rootsuffix Exp</StartArguments>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
-    <StartAction>Program</StartAction>
-    <StartProgram>C:\Program Files (x86)\Microsoft Visual Studio 10.0\Common7\IDE\devenv.exe</StartProgram>
-    <StartArguments>/rootsuffix Exp</StartArguments>
-  </PropertyGroup>
-</Project>
\ No newline at end of file