diff --git a/configure.ac b/configure.ac
index 4880b3b3..a388374d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -575,6 +575,7 @@ src/libs/Makefile
 src/libs/zmbv/Makefile
 src/libs/gui_tk/Makefile
 src/libs/decoders/Makefile
+src/libs/nuked/Makefile
 src/misc/Makefile
 src/shell/Makefile
 src/platform/Makefile
diff --git a/src/Makefile.am b/src/Makefile.am
index a9bf13df..21f810ce 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -14,6 +14,9 @@ endif
 dosbox_SOURCES = dosbox.cpp $(ico_stuff)
 dosbox_LDADD = cpu/libcpu.a debug/libdebug.a dos/libdos.a fpu/libfpu.a  hardware/libhardware.a gui/libgui.a \
                ints/libints.a misc/libmisc.a shell/libshell.a hardware/mame/libmame.a \
-               hardware/serialport/libserial.a libs/gui_tk/libgui_tk.a libs/decoders/libdecoders.a
+               hardware/serialport/libserial.a \
+               libs/decoders/libdecoders.a \
+               libs/gui_tk/libgui_tk.a \
+               libs/nuked/libnuked.a
 
 EXTRA_DIST = winres.rc dosbox.ico
diff --git a/src/hardware/Makefile.am b/src/hardware/Makefile.am
index 3d0b67d3..e9d63d2c 100644
--- a/src/hardware/Makefile.am
+++ b/src/hardware/Makefile.am
@@ -2,7 +2,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/include
 
 SUBDIRS = serialport mame
 
-EXTRA_DIST = opl.cpp opl.h adlib.h dbopl.h pci_devices.h nukedopl.h
+EXTRA_DIST = opl.cpp opl.h adlib.h dbopl.h pci_devices.h
 
 noinst_LIBRARIES = libhardware.a
 
@@ -10,4 +10,4 @@ libhardware_a_SOURCES = adlib.cpp dma.cpp gameblaster.cpp hardware.cpp iohandler
                         memory.cpp mixer.cpp pcspeaker.cpp pci_bus.cpp pic.cpp sblaster.cpp tandy_sound.cpp timer.cpp \
 			vga.cpp vga_attr.cpp vga_crtc.cpp vga_dac.cpp vga_draw.cpp vga_gfx.cpp vga_other.cpp \
 			vga_memory.cpp vga_misc.cpp vga_seq.cpp vga_xga.cpp vga_s3.cpp vga_tseng.cpp vga_paradise.cpp \
-			cmos.cpp disney.cpp gus.cpp mpu401.cpp ipx.cpp ipxserver.cpp dbopl.cpp nukedopl.cpp
+			cmos.cpp disney.cpp gus.cpp mpu401.cpp ipx.cpp ipxserver.cpp dbopl.cpp
diff --git a/src/hardware/adlib.cpp b/src/hardware/adlib.cpp
index 34ae1845..81f96f39 100644
--- a/src/hardware/adlib.cpp
+++ b/src/hardware/adlib.cpp
@@ -16,7 +16,6 @@
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-
 #include <stdlib.h>
 #include <string.h>
 #include <math.h>
@@ -27,12 +26,13 @@
 #include "mapper.h"
 #include "mem.h"
 #include "dbopl.h"
-#include "nukedopl.h"
+#include "../libs/nuked/nukedopl.h"
 
 #include "mame/emu.h"
 #include "mame/fmopl.h"
 #include "mame/ymf262.h"
 
+
 #define OPL2_INTERNAL_FREQ    3600000   // The OPL2 operates at 3.6MHz
 #define OPL3_INTERNAL_FREQ    14400000  // The OPL3 operates at 14.4MHz
 
diff --git a/src/libs/Makefile.am b/src/libs/Makefile.am
index c614d53a..06c434e6 100644
--- a/src/libs/Makefile.am
+++ b/src/libs/Makefile.am
@@ -1,4 +1,3 @@
 AM_CPPFLAGS = -I$(top_srcdir)/include
 
-SUBDIRS = zmbv gui_tk decoders
-
+SUBDIRS = zmbv gui_tk decoders nuked
diff --git a/src/libs/nuked/Makefile.am b/src/libs/nuked/Makefile.am
new file mode 100644
index 00000000..c33f1f99
--- /dev/null
+++ b/src/libs/nuked/Makefile.am
@@ -0,0 +1,7 @@
+AM_CPPFLAGS = -I$(top_srcdir)/include
+
+EXTRA_DIST = nukedopl.h
+
+noinst_LIBRARIES = libnuked.a
+
+libnuked_a_SOURCES = nukedopl.cpp
diff --git a/src/hardware/nukedopl.cpp b/src/libs/nuked/nukedopl.cpp
similarity index 100%
rename from src/hardware/nukedopl.cpp
rename to src/libs/nuked/nukedopl.cpp
diff --git a/src/hardware/nukedopl.h b/src/libs/nuked/nukedopl.h
similarity index 100%
rename from src/hardware/nukedopl.h
rename to src/libs/nuked/nukedopl.h