diff --git a/autogen.sh b/autogen.sh
index 5bb2d9d..f8d13c8 100644
--- a/autogen.sh
+++ b/autogen.sh
@@ -6,12 +6,15 @@
 # Full license can be found in the LICENSE file
 #
 
-cd `dirname "$0"`
+cd $(dirname "$0")
 
-if [ "`uname`" = "Darwin" ]; then
-  libtoolBin=$(which glibtoolize)
-  libtoolBinDir=$(dirname "${libtoolBin}")
-  ln -s $libtoolBin "${libtoolBinDir}/libtoolize"
+if [ "$(uname)" = "Darwin" ]; then
+libtoolBin=$(which glibtoolize)
+libtoolBinDir=$(dirname "${libtoolBin}")
+
+if [ ! -f "${libtoolBinDir}/libtoolize" ]; then
+ln -s $libtoolBin "${libtoolBinDir}/libtoolize"
+fi
 fi
 
 autoheader
diff --git a/configure.ac b/configure.ac
index ae3943d..1fea297 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7,7 +7,7 @@
 #*****************************************************************************
 
 AC_PREREQ([2.69])
-AC_INIT([cglm], [0.2.0], [info@recp.me])
+AC_INIT([cglm], [0.2.1], [info@recp.me])
 AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects])
 
 AC_CONFIG_MACRO_DIR([m4])
diff --git a/include/cglm-version.h b/include/cglm-version.h
index bd0263c..74f0a09 100644
--- a/include/cglm-version.h
+++ b/include/cglm-version.h
@@ -10,6 +10,6 @@
 
 #define CGLM_VERSION_MAJOR 0
 #define CGLM_VERSION_MINOR 2
-#define CGLM_VERSION_PATCH 0
+#define CGLM_VERSION_PATCH 1
 
 #endif /* cglm_version_h */
diff --git a/makefile.am b/makefile.am
index 595ff15..d491a17 100644
--- a/makefile.am
+++ b/makefile.am
@@ -32,36 +32,41 @@ TESTS = $(check_PROGRAMS)
 test_test_mat4_LDFLAGS = $(checkLDFLAGS)
 test_test_mat4_CFLAGS  = $(checkCFLAGS)
 
-nobase_include_HEADERS = include/cglm-version.h \
-                         include/cglm.h \
-                         include/cglm-call.h \
-                         include/cglm-cam.h \
-                         include/cglm-io.h \
-                         include/cglm-mat3.h \
-                         include/cglm-types.h \
-                         include/cglm-common.h \
-                         include/cglm-affine.h \
-                         include/cglm-vec.h \
-                         include/cglm-euler.h \
-                         include/cglm-util.h \
-                         include/cglm-quat.h \
-                         include/cglm-mat.h \
-                         include/cglm-affine-mat.h \
-                         include/arch/simd/cglm-mat-simd-avx.h \
+cglmdir=$(includedir)/cglm
+cglm_HEADERS = include/cglm-version.h \
+               include/cglm.h \
+               include/cglm-call.h \
+               include/cglm-cam.h \
+               include/cglm-io.h \
+               include/cglm-mat3.h \
+               include/cglm-types.h \
+               include/cglm-common.h \
+               include/cglm-affine.h \
+               include/cglm-vec.h \
+               include/cglm-euler.h \
+               include/cglm-util.h \
+               include/cglm-quat.h \
+               include/cglm-mat.h \
+               include/cglm-affine-mat.h
+
+cglm_arch_simddir=$(includedir)/cglm/arch/simd/
+cglm_arch_simd_HEADERS = include/arch/simd/cglm-mat-simd-avx.h \
                          include/arch/simd/cglm-affine-mat-avx.h \
                          include/arch/simd/cglm-quat-simd.h \
                          include/arch/simd/cglm-affine-mat-sse2.h \
                          include/arch/simd/cglm-mat3-simd-sse2.h \
                          include/arch/simd/cglm-mat-simd-sse2.h \
-                         include/arch/simd/cglm-intrin.h \
-                         include/call/cglmc-euler.h \
-                         include/call/cglmc-quat.h \
-                         include/call/cglmc-cam.h \
-                         include/call/cglmc-io.h \
-                         include/call/cglmc-affine.h \
-                         include/call/cglmc-vec.h \
-                         include/call/cglmc-mat3.h \
-                         include/call/cglmc-mat.h
+                         include/arch/simd/cglm-intrin.h
+
+cglm_calldir=$(includedir)/cglm/call
+cglm_call_HEADERS = include/call/cglmc-euler.h \
+                    include/call/cglmc-quat.h \
+                    include/call/cglmc-cam.h \
+                    include/call/cglmc-io.h \
+                    include/call/cglmc-affine.h \
+                    include/call/cglmc-vec.h \
+                    include/call/cglmc-mat3.h \
+                    include/call/cglmc-mat.h
 
 libcglm_la_SOURCES=\
     src/cglm-euler.c \