diff --git a/configure b/configure
index eb9d73a..9a28082 100755
--- a/configure
+++ b/configure
@@ -191,6 +191,7 @@ nptl="yes"
 mixemu="no"
 bluez="yes"
 kvm="no"
+atapi_pt="no"
 kerneldir=""
 aix="no"
 blobs="yes"
@@ -323,6 +324,19 @@ AIX)
 aix="yes"
 make="gmake"
 ;;
+Linux)
+atapi_pt="yes"
+audio_drv_list="oss"
+audio_possible_drivers="oss alsa sdl esd pa"
+linux="yes"
+linux_user="yes"
+usb="linux"
+kvm="yes"
+if [ "$cpu" = "i386" -o "$cpu" = "x86_64" ] ; then
+    kqemu="yes"
+    audio_possible_drivers="$audio_possible_drivers fmod"
+fi
+;;
 *)
 audio_drv_list="oss"
 audio_possible_drivers="oss alsa sdl esd pa"
@@ -501,6 +515,10 @@ for opt do
   ;;
   --disable-docs) build_docs="no"
   ;;
+  --enable-atapi-pt) atapi_pt="yes"
+  ;;
+  --disable-atapi-pt) atapi_pt="no"
+  ;;
   *) echo "ERROR: unknown option $opt"; show_help="yes"
   ;;
   esac
@@ -646,6 +664,8 @@ echo "  --disable-vde            disable support for vde network"
 echo "  --disable-pthread        disable pthread support"
 echo "  --disable-aio            disable AIO support"
 echo "  --enable-io-thread       enable IO thread"
+echo "  --enable-atapi-pt        enable atapi device pass through"
+echo "  --disable-atapi-pt       disable atapi device pass through"
 echo "  --disable-blobs          disable installing provided firmware blobs"
 echo "  --kerneldir=PATH         look for kernel includes in PATH"
 echo ""
@@ -1453,6 +1473,7 @@ echo "Install blobs     $blobs"
 echo -e "KVM support       $kvm"
 echo "fdt support       $fdt"
 echo "preadv support    $preadv"
+echo "atapi-pt support  $atapi_pt"
 
 if test $sdl_too_old = "yes"; then
 echo "-> Your SDL version is too old - please upgrade to have SDL support"
@@ -1823,6 +1844,22 @@ bsd)
 ;;
 esac
 
+# ATAPI pass through
+if [ "$atapi_pt" = "yes" ] ; then
+  if [ "$targetos" != "Linux" ] ; then
+    echo "error: you need a Linux target OS to use ATAPI pass through" >&2
+    exit 1
+  fi
+  cat <<EOF >>$config_h
+#define CONFIG_ATAPI_PT 1
+#ifndef __linux__
+#error "You can't enable ATAPI pass through if you're not using linux."
+#endif /* __linux__ */
+EOF
+else
+  echo "#define CONFIG_ATAPI_PT 0" >>$config_h
+fi
+
 # Determine what linker flags to use to force archive inclusion
 check_linker_flags()
 {