diff --git a/common/jpeg/simd/Makefile.am b/common/jpeg/simd/Makefile.am
new file mode 100644
index 0000000..ea53fee
--- /dev/null
+++ b/common/jpeg/simd/Makefile.am
@@ -0,0 +1,27 @@
+noinst_LTLIBRARIES = libsimd.la
+
+BUILT_SOURCES = jsimdcfg.inc
+
+EXTRA_DIST = nasm_lt.sh
+
+libsimd_la_SOURCES = jsimd.h jsimdcfg.inc.h \
+	jsimdext.inc jcolsamp.inc jdct.inc \
+	jsimdcpu.asm \
+	jccolmmx.asm jdcolmmx.asm \
+	jcsammmx.asm jdsammmx.asm jdmermmx.asm \
+	jcqntmmx.asm jfmmxfst.asm jfmmxint.asm \
+	jimmxred.asm jimmxint.asm jimmxfst.asm \
+	jcqnt3dn.asm jf3dnflt.asm ji3dnflt.asm \
+	jcqntsse.asm jfsseflt.asm jisseflt.asm \
+	jccolss2.asm jdcolss2.asm \
+	jcsamss2.asm jdsamss2.asm jdmerss2.asm \
+	jcqnts2i.asm jfss2fst.asm jfss2int.asm \
+	jiss2red.asm jiss2int.asm jiss2fst.asm \
+	jcqnts2f.asm jiss2flt.asm
+
+.asm.lo:
+	$(LIBTOOL) --mode=compile --tag NASM ./nasm_lt.sh $(NASM) $(NAFLAGS) $< -o $@
+
+jsimdcfg.inc: jsimdcfg.inc.h ../jpeglib.h ../jconfig.h ../jmorecfg.h
+	$(CPP) $< | grep ^[\;%] | sed 's%_cpp_protection_%%' > $@
+
diff --git a/common/jpeg/simd/jccolmmx.asm b/common/jpeg/simd/jccolmmx.asm
index 701a327..340af00 100644
--- a/common/jpeg/simd/jccolmmx.asm
+++ b/common/jpeg/simd/jccolmmx.asm
@@ -16,8 +16,8 @@
 ;
 ; [TAB8]
 
-%include "simd/jsimdext.inc"
-%include "simd/jcolsamp.inc"
+%include "jsimdext.inc"
+%include "jcolsamp.inc"
 
 ; --------------------------------------------------------------------------
 
diff --git a/common/jpeg/simd/jccolss2.asm b/common/jpeg/simd/jccolss2.asm
index 99473b6..c13f89e 100644
--- a/common/jpeg/simd/jccolss2.asm
+++ b/common/jpeg/simd/jccolss2.asm
@@ -13,8 +13,8 @@
 ;
 ; [TAB8]
 
-%include "simd/jsimdext.inc"
-%include "simd/jcolsamp.inc"
+%include "jsimdext.inc"
+%include "jcolsamp.inc"
 
 ; --------------------------------------------------------------------------
 
diff --git a/common/jpeg/simd/jcqnt3dn.asm b/common/jpeg/simd/jcqnt3dn.asm
index bc9b027..194b7f9 100644
--- a/common/jpeg/simd/jcqnt3dn.asm
+++ b/common/jpeg/simd/jcqnt3dn.asm
@@ -16,8 +16,8 @@
 ;
 ; [TAB8]
 
-%include "simd/jsimdext.inc"
-%include "simd/jdct.inc"
+%include "jsimdext.inc"
+%include "jdct.inc"
 
 ; --------------------------------------------------------------------------
 	SECTION	SEG_TEXT
diff --git a/common/jpeg/simd/jcqntmmx.asm b/common/jpeg/simd/jcqntmmx.asm
index 6096eaa..fa54902 100644
--- a/common/jpeg/simd/jcqntmmx.asm
+++ b/common/jpeg/simd/jcqntmmx.asm
@@ -16,8 +16,8 @@
 ;
 ; [TAB8]
 
-%include "simd/jsimdext.inc"
-%include "simd/jdct.inc"
+%include "jsimdext.inc"
+%include "jdct.inc"
 
 ; --------------------------------------------------------------------------
 	SECTION	SEG_TEXT
diff --git a/common/jpeg/simd/jcqnts2f.asm b/common/jpeg/simd/jcqnts2f.asm
index eef547a..19c1d01 100644
--- a/common/jpeg/simd/jcqnts2f.asm
+++ b/common/jpeg/simd/jcqnts2f.asm
@@ -16,8 +16,8 @@
 ;
 ; [TAB8]
 
-%include "simd/jsimdext.inc"
-%include "simd/jdct.inc"
+%include "jsimdext.inc"
+%include "jdct.inc"
 
 ; --------------------------------------------------------------------------
 	SECTION	SEG_TEXT
diff --git a/common/jpeg/simd/jcqnts2i.asm b/common/jpeg/simd/jcqnts2i.asm
index 7414e41..404ae95 100644
--- a/common/jpeg/simd/jcqnts2i.asm
+++ b/common/jpeg/simd/jcqnts2i.asm
@@ -16,8 +16,8 @@
 ;
 ; [TAB8]
 
-%include "simd/jsimdext.inc"
-%include "simd/jdct.inc"
+%include "jsimdext.inc"
+%include "jdct.inc"
 
 ; --------------------------------------------------------------------------
 	SECTION	SEG_TEXT
diff --git a/common/jpeg/simd/jcqntsse.asm b/common/jpeg/simd/jcqntsse.asm
index da7a3ff..0f412d7 100644
--- a/common/jpeg/simd/jcqntsse.asm
+++ b/common/jpeg/simd/jcqntsse.asm
@@ -16,8 +16,8 @@
 ;
 ; [TAB8]
 
-%include "simd/jsimdext.inc"
-%include "simd/jdct.inc"
+%include "jsimdext.inc"
+%include "jdct.inc"
 
 ; --------------------------------------------------------------------------
 	SECTION	SEG_TEXT
diff --git a/common/jpeg/simd/jcsammmx.asm b/common/jpeg/simd/jcsammmx.asm
index 5de3637..982a6e0 100644
--- a/common/jpeg/simd/jcsammmx.asm
+++ b/common/jpeg/simd/jcsammmx.asm
@@ -16,7 +16,7 @@
 ;
 ; [TAB8]
 
-%include "simd/jsimdext.inc"
+%include "jsimdext.inc"
 
 ; --------------------------------------------------------------------------
 	SECTION	SEG_TEXT
diff --git a/common/jpeg/simd/jcsamss2.asm b/common/jpeg/simd/jcsamss2.asm
index ec2df9a..98e97da 100644
--- a/common/jpeg/simd/jcsamss2.asm
+++ b/common/jpeg/simd/jcsamss2.asm
@@ -16,7 +16,7 @@
 ;
 ; [TAB8]
 
-%include "simd/jsimdext.inc"
+%include "jsimdext.inc"
 
 ; --------------------------------------------------------------------------
 	SECTION	SEG_TEXT
diff --git a/common/jpeg/simd/jdcolmmx.asm b/common/jpeg/simd/jdcolmmx.asm
index 33d5063..742c9ce 100644
--- a/common/jpeg/simd/jdcolmmx.asm
+++ b/common/jpeg/simd/jdcolmmx.asm
@@ -16,8 +16,8 @@
 ;
 ; [TAB8]
 
-%include "simd/jsimdext.inc"
-%include "simd/jcolsamp.inc"
+%include "jsimdext.inc"
+%include "jcolsamp.inc"
 
 ; --------------------------------------------------------------------------
 
diff --git a/common/jpeg/simd/jdcolss2.asm b/common/jpeg/simd/jdcolss2.asm
index 3fd591b..6f74cc6 100644
--- a/common/jpeg/simd/jdcolss2.asm
+++ b/common/jpeg/simd/jdcolss2.asm
@@ -16,8 +16,8 @@
 ;
 ; [TAB8]
 
-%include "simd/jsimdext.inc"
-%include "simd/jcolsamp.inc"
+%include "jsimdext.inc"
+%include "jcolsamp.inc"
 
 ; --------------------------------------------------------------------------
 
diff --git a/common/jpeg/simd/jdmermmx.asm b/common/jpeg/simd/jdmermmx.asm
index 8d82e40..8ebe243 100644
--- a/common/jpeg/simd/jdmermmx.asm
+++ b/common/jpeg/simd/jdmermmx.asm
@@ -16,8 +16,8 @@
 ;
 ; [TAB8]
 
-%include "simd/jsimdext.inc"
-%include "simd/jcolsamp.inc"
+%include "jsimdext.inc"
+%include "jcolsamp.inc"
 
 ; --------------------------------------------------------------------------
 
diff --git a/common/jpeg/simd/jdmerss2.asm b/common/jpeg/simd/jdmerss2.asm
index c0804ec..8a7c68f 100644
--- a/common/jpeg/simd/jdmerss2.asm
+++ b/common/jpeg/simd/jdmerss2.asm
@@ -16,8 +16,8 @@
 ;
 ; [TAB8]
 
-%include "simd/jsimdext.inc"
-%include "simd/jcolsamp.inc"
+%include "jsimdext.inc"
+%include "jcolsamp.inc"
 
 ; --------------------------------------------------------------------------
 
diff --git a/common/jpeg/simd/jdsammmx.asm b/common/jpeg/simd/jdsammmx.asm
index f061ee9..e05d540 100644
--- a/common/jpeg/simd/jdsammmx.asm
+++ b/common/jpeg/simd/jdsammmx.asm
@@ -16,7 +16,7 @@
 ;
 ; [TAB8]
 
-%include "simd/jsimdext.inc"
+%include "jsimdext.inc"
 
 ; --------------------------------------------------------------------------
 	SECTION	SEG_CONST
diff --git a/common/jpeg/simd/jdsamss2.asm b/common/jpeg/simd/jdsamss2.asm
index bd967db..7d787f1 100644
--- a/common/jpeg/simd/jdsamss2.asm
+++ b/common/jpeg/simd/jdsamss2.asm
@@ -16,7 +16,7 @@
 ;
 ; [TAB8]
 
-%include "simd/jsimdext.inc"
+%include "jsimdext.inc"
 
 ; --------------------------------------------------------------------------
 	SECTION	SEG_CONST
diff --git a/common/jpeg/simd/jf3dnflt.asm b/common/jpeg/simd/jf3dnflt.asm
index 30d3340..ed7e6a0 100644
--- a/common/jpeg/simd/jf3dnflt.asm
+++ b/common/jpeg/simd/jf3dnflt.asm
@@ -20,8 +20,8 @@
 ;
 ; [TAB8]
 
-%include "simd/jsimdext.inc"
-%include "simd/jdct.inc"
+%include "jsimdext.inc"
+%include "jdct.inc"
 
 ; --------------------------------------------------------------------------
 	SECTION	SEG_CONST
diff --git a/common/jpeg/simd/jfmmxfst.asm b/common/jpeg/simd/jfmmxfst.asm
index 46556b1..3511457 100644
--- a/common/jpeg/simd/jfmmxfst.asm
+++ b/common/jpeg/simd/jfmmxfst.asm
@@ -21,8 +21,8 @@
 ;
 ; [TAB8]
 
-%include "simd/jsimdext.inc"
-%include "simd/jdct.inc"
+%include "jsimdext.inc"
+%include "jdct.inc"
 
 ; --------------------------------------------------------------------------
 
diff --git a/common/jpeg/simd/jfmmxint.asm b/common/jpeg/simd/jfmmxint.asm
index 87935a9..e018e6b 100644
--- a/common/jpeg/simd/jfmmxint.asm
+++ b/common/jpeg/simd/jfmmxint.asm
@@ -21,8 +21,8 @@
 ;
 ; [TAB8]
 
-%include "simd/jsimdext.inc"
-%include "simd/jdct.inc"
+%include "jsimdext.inc"
+%include "jdct.inc"
 
 ; --------------------------------------------------------------------------
 
diff --git a/common/jpeg/simd/jfss2fst.asm b/common/jpeg/simd/jfss2fst.asm
index e42d225..f0ad962 100644
--- a/common/jpeg/simd/jfss2fst.asm
+++ b/common/jpeg/simd/jfss2fst.asm
@@ -21,8 +21,8 @@
 ;
 ; [TAB8]
 
-%include "simd/jsimdext.inc"
-%include "simd/jdct.inc"
+%include "jsimdext.inc"
+%include "jdct.inc"
 
 ; --------------------------------------------------------------------------
 
diff --git a/common/jpeg/simd/jfss2int.asm b/common/jpeg/simd/jfss2int.asm
index 6e37497..5338db3 100644
--- a/common/jpeg/simd/jfss2int.asm
+++ b/common/jpeg/simd/jfss2int.asm
@@ -21,8 +21,8 @@
 ;
 ; [TAB8]
 
-%include "simd/jsimdext.inc"
-%include "simd/jdct.inc"
+%include "jsimdext.inc"
+%include "jdct.inc"
 
 ; --------------------------------------------------------------------------
 
diff --git a/common/jpeg/simd/jfsseflt.asm b/common/jpeg/simd/jfsseflt.asm
index 6469f3c..9b8d04c 100644
--- a/common/jpeg/simd/jfsseflt.asm
+++ b/common/jpeg/simd/jfsseflt.asm
@@ -20,8 +20,8 @@
 ;
 ; [TAB8]
 
-%include "simd/jsimdext.inc"
-%include "simd/jdct.inc"
+%include "jsimdext.inc"
+%include "jdct.inc"
 
 ; --------------------------------------------------------------------------
 
diff --git a/common/jpeg/simd/ji3dnflt.asm b/common/jpeg/simd/ji3dnflt.asm
index 0f5cbd8..6c9abca 100644
--- a/common/jpeg/simd/ji3dnflt.asm
+++ b/common/jpeg/simd/ji3dnflt.asm
@@ -20,8 +20,8 @@
 ;
 ; [TAB8]
 
-%include "simd/jsimdext.inc"
-%include "simd/jdct.inc"
+%include "jsimdext.inc"
+%include "jdct.inc"
 
 ; --------------------------------------------------------------------------
 	SECTION	SEG_CONST
diff --git a/common/jpeg/simd/jimmxfst.asm b/common/jpeg/simd/jimmxfst.asm
index 662a522..e5802ac 100644
--- a/common/jpeg/simd/jimmxfst.asm
+++ b/common/jpeg/simd/jimmxfst.asm
@@ -21,8 +21,8 @@
 ;
 ; [TAB8]
 
-%include "simd/jsimdext.inc"
-%include "simd/jdct.inc"
+%include "jsimdext.inc"
+%include "jdct.inc"
 
 ; --------------------------------------------------------------------------
 
diff --git a/common/jpeg/simd/jimmxint.asm b/common/jpeg/simd/jimmxint.asm
index 775b1e8..563f41c 100644
--- a/common/jpeg/simd/jimmxint.asm
+++ b/common/jpeg/simd/jimmxint.asm
@@ -21,8 +21,8 @@
 ;
 ; [TAB8]
 
-%include "simd/jsimdext.inc"
-%include "simd/jdct.inc"
+%include "jsimdext.inc"
+%include "jdct.inc"
 
 ; --------------------------------------------------------------------------
 
diff --git a/common/jpeg/simd/jimmxred.asm b/common/jpeg/simd/jimmxred.asm
index a5ad52b..4ee34a0 100644
--- a/common/jpeg/simd/jimmxred.asm
+++ b/common/jpeg/simd/jimmxred.asm
@@ -21,8 +21,8 @@
 ;
 ; [TAB8]
 
-%include "simd/jsimdext.inc"
-%include "simd/jdct.inc"
+%include "jsimdext.inc"
+%include "jdct.inc"
 
 ; --------------------------------------------------------------------------
 
diff --git a/common/jpeg/simd/jiss2flt.asm b/common/jpeg/simd/jiss2flt.asm
index 6bb429a..fc9e21a 100644
--- a/common/jpeg/simd/jiss2flt.asm
+++ b/common/jpeg/simd/jiss2flt.asm
@@ -20,8 +20,8 @@
 ;
 ; [TAB8]
 
-%include "simd/jsimdext.inc"
-%include "simd/jdct.inc"
+%include "jsimdext.inc"
+%include "jdct.inc"
 
 ; --------------------------------------------------------------------------
 
diff --git a/common/jpeg/simd/jiss2fst.asm b/common/jpeg/simd/jiss2fst.asm
index aafa810..fda073f 100644
--- a/common/jpeg/simd/jiss2fst.asm
+++ b/common/jpeg/simd/jiss2fst.asm
@@ -21,8 +21,8 @@
 ;
 ; [TAB8]
 
-%include "simd/jsimdext.inc"
-%include "simd/jdct.inc"
+%include "jsimdext.inc"
+%include "jdct.inc"
 
 ; --------------------------------------------------------------------------
 
diff --git a/common/jpeg/simd/jiss2int.asm b/common/jpeg/simd/jiss2int.asm
index 4122c64..d568dad 100644
--- a/common/jpeg/simd/jiss2int.asm
+++ b/common/jpeg/simd/jiss2int.asm
@@ -21,8 +21,8 @@
 ;
 ; [TAB8]
 
-%include "simd/jsimdext.inc"
-%include "simd/jdct.inc"
+%include "jsimdext.inc"
+%include "jdct.inc"
 
 ; --------------------------------------------------------------------------
 
diff --git a/common/jpeg/simd/jiss2red.asm b/common/jpeg/simd/jiss2red.asm
index b31346a..10046e9 100644
--- a/common/jpeg/simd/jiss2red.asm
+++ b/common/jpeg/simd/jiss2red.asm
@@ -21,8 +21,8 @@
 ;
 ; [TAB8]
 
-%include "simd/jsimdext.inc"
-%include "simd/jdct.inc"
+%include "jsimdext.inc"
+%include "jdct.inc"
 
 ; --------------------------------------------------------------------------
 
diff --git a/common/jpeg/simd/jisseflt.asm b/common/jpeg/simd/jisseflt.asm
index 6de93ad..db9d1a3 100644
--- a/common/jpeg/simd/jisseflt.asm
+++ b/common/jpeg/simd/jisseflt.asm
@@ -20,8 +20,8 @@
 ;
 ; [TAB8]
 
-%include "simd/jsimdext.inc"
-%include "simd/jdct.inc"
+%include "jsimdext.inc"
+%include "jdct.inc"
 
 ; --------------------------------------------------------------------------
 
diff --git a/common/jpeg/simd/jsimdcpu.asm b/common/jpeg/simd/jsimdcpu.asm
index 7838e27..31f2a6a 100644
--- a/common/jpeg/simd/jsimdcpu.asm
+++ b/common/jpeg/simd/jsimdcpu.asm
@@ -16,7 +16,7 @@
 ;
 ; [TAB8]
 
-%include "simd/jsimdext.inc"
+%include "jsimdext.inc"
 
 ; --------------------------------------------------------------------------
 	SECTION	SEG_TEXT
diff --git a/common/jpeg/simd/jsimdext.inc b/common/jpeg/simd/jsimdext.inc
index 8bbf64e..d82b970 100644
--- a/common/jpeg/simd/jsimdext.inc
+++ b/common/jpeg/simd/jsimdext.inc
@@ -272,6 +272,6 @@
 ; --------------------------------------------------------------------------
 ;  Defines picked up from the C headers
 ;
-%include "simd/jsimdcfg.inc"
+%include "jsimdcfg.inc"
 
 ; --------------------------------------------------------------------------
diff --git a/common/jpeg/simd/nasm_lt.sh b/common/jpeg/simd/nasm_lt.sh
new file mode 100755
index 0000000..ef5a591
--- /dev/null
+++ b/common/jpeg/simd/nasm_lt.sh
@@ -0,0 +1,57 @@
+#! /bin/sh
+command=""
+infile=""
+o_opt=no
+pic=no
+while [ $# -gt 0 ]; do
+    case "$1" in
+        -DPIC|-fPIC|-fpic)
+            if [ "$pic" != "yes" ] ; then
+                command="$command -DPIC"
+                pic=yes
+            fi
+            ;;
+        -f|-fbin|-faout|-faoutb|-fcoff|-felf|-fas86| \
+        -fobj|-fwin32|-frdf|-fieee|-fmacho)
+            # it's a file format specifier for nasm.
+            command="$command $1"
+            ;;
+        -f*)
+            # maybe a code-generation flag for gcc.
+            ;;
+        -[Ii]*)
+            incdir=`echo "$1" | sed 's/^-[Ii]//'`
+            if [ "x$incdir" = x -a "x$2" != x ] ; then
+                case "$2" in
+                    -*) ;;
+                    *) incdir="$2"; shift;;
+                esac
+            fi
+            if [ "x$incdir" != x ] ; then
+                # In the case of NASM, the trailing slash is necessary.
+                incdir=`echo "$incdir" | sed 's%/*$%/%'`
+                command="$command -I$incdir"
+            fi
+            ;;
+        -o*)
+            o_opt=yes
+            command="$command $1"
+            ;;
+        *.asm)
+            infile=$1
+            command="$command $1"
+            ;;
+        *)
+            command="$command $1"
+            ;;
+    esac
+    shift
+done
+if [ "$o_opt" != yes ] ; then
+    # By default, NASM creates an output file
+    # in the same directory as the input file.
+    outfile="-o `echo $infile | sed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.o"
+    command="$command $outfile"
+fi
+echo $command
+exec $command