diff --git a/media-video/aegisub/aegisub-9999.ebuild b/media-video/aegisub/aegisub-9999.ebuild
index 13012a2..d0bbed9 100644
--- a/media-video/aegisub/aegisub-9999.ebuild
+++ b/media-video/aegisub/aegisub-9999.ebuild
@@ -59,7 +59,7 @@ DEPEND="${RDEPEND}
 	dev-util/intltool
 	sys-devel/gettext
 	virtual/pkgconfig
-	dev-lua/moonscript
+	dependency_control? ( dev-lua/moonscript )
 "
 
 REQUIRED_USE="|| ( alsa openal oss portaudio pulseaudio )"
@@ -119,21 +119,36 @@ src_install() {
 
 	if use dependency_control; then
 		ffi_build="${WORKDIR}/ffi-experiments-build"
-		automation_dir="${ED}/usr/share/aegisub/automation"
+		automation_dir="/usr/share/aegisub/automation"
 
-		newins "${ffi_build}/bad-mutex/libBadMutex.so" "${automation_dir}/include/BM/BadMutex/libBadMutex.so"
-		newins "${ffi_build}/bad-mutex/BadMutex.lua" "${automation_dir}/include/BM/BadMutex.lua"
-		newins "${ffi_build}/download-manager/libDownloadManager.so" "${automation_dir}/include/DM/DownloadManager/libDownloadManager.so"
-		newins "${ffi_build}/download-manager/DownloadManager.lua" "${automation_dir}/include/DM/DownloadManager.lua"
-		newins "${ffi_build}/precise-timer/PreciseTimer.lua" "${automation_dir}/include/PT/PreciseTimer.lua"
-		newins "${ffi_build}/precise-timer/libPreciseTimer.so" "${automation_dir}/include/PT/PreciseTimer/libPreciseTimer.so"
-		newins "${ffi_build}/requireffi/requireffi.lua" "${automation_dir}/include/requireffi/requireffi.lua"
+		insinto "$automation_dir/include/BM/BadMutex"
+		doins "${ffi_build}/bad-mutex/libBadMutex.so"
+		insinto "$automation_dir/include/BM"
+		doins "${ffi_build}/bad-mutex/BadMutex.lua"
 
-		newins -r "${WORKDIR}/DependencyControl-${_depctrlver}/modules" "${automation_dir}/include/l0"
-		newins -r "${WORKDIR}/DependencyControl-${_depctrlver}/macros" "${automation_dir}/autoload"
+		insinto "$automation_dir/include/DM/DownloadManager"
+		doins "${ffi_build}/download-manager/libDownloadManager.so"
+		insinto "$automation_dir/include/DM"
+		doins "${ffi_build}/download-manager/DownloadManager.lua"
 
-		newins "${WORKDIR}/luajson-${_luajsonver}/lua/json.lua" "${automation_dir}/include"
-		newins -r "${WORKDIR}/luajson-${_luajsonver}/lua/json" "${automation_dir}/include/json"
+		insinto "$automation_dir/include/PT/PreciseTimer"
+		doins "${ffi_build}/precise-timer/libPreciseTimer.so"
+		insinto "$automation_dir/include/PT"
+		doins "${ffi_build}/precise-timer/PreciseTimer.lua"
+
+		insinto "$automation_dir/include/PT"
+		doins "${ffi_build}/requireffi/requireffi.lua"
+
+		insinto "$automation_dir/include"
+		cp -r "${WORKDIR}/DependencyControl-${_depctrlver}/modules" "${WORKDIR}/l0"
+		doins -r "${WORKDIR}/l0"
+		insinto "$automation_dir"
+		cp -r "$WORKDIR/DependencyControl-${_depctrlver}/macros" "${WORKDIR}/autoload"
+		doins -r "$WORKDIR/autoload"
+
+		insinto "$automation_dir/include"
+		doins "${WORKDIR}/luajson-${_luajsonver}/lua/json.lua"
+	    doins -r "${WORKDIR}/luajson-${_luajsonver}/lua/json"
 	fi
 }