diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f6a5e6b3..4d9777a8 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -74,7 +74,7 @@ jobs:
     - name: Installing Radare2
       run: sudo dpkg -i radare2/dist/debian/*/*.deb
     - name: Building r2ghidra with cmake
-      run: git submodule update --init ; make ghidra/ghidra/Ghidra ; mkdir build && cd build && cmake .. && make -j4 && sudo make install
+      run: git submodule update --init ; make ghidra-native ; mkdir build && cd build && cmake .. && make -j4 && sudo make install
     - name: Packaging r2ghidra for Debian
       run: make -C dist/debian
     - name: Testing r2ghidra oneliner
@@ -151,7 +151,7 @@ jobs:
         set PATH=%CD%\radare2\bin;%PATH%
         set ARCH=x64
         git submodule update --init
-        make ghidra/ghidra/Ghidra
+        make ghidra-native
         call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64
         mkdir destdir build
         cd build
diff --git a/Makefile b/Makefile
index 6a03565d..ccc3e824 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@ DESTDIR?=
 GHIDRA_NATIVE_COMMIT=7c76f1f9544f7064c3d7deb73a4eaa5b844aea2d
 
 ifeq ($(shell test -f config.mk && echo $$?),0)
-all: ghidra-native/.patched ghidra-processors.txt
+all: ghidra-native ghidra-processors.txt
 	$(MAKE) -C src
 	$(MAKE) -C src sleigh-build
 else
@@ -22,7 +22,7 @@ purge: clean
 ghidra-processors.txt:
 	cp -f ghidra-processors.txt.default ghidra-processors.txt
 
-asan: ghidra/ghidra/Ghidra ghidra-processors.txt
+asan: ghidra-native ghidra-processors.txt
 	#touch ghidra/ghidra/Ghidra/Features/Decompiler/src/decompile/cpp/*.cc src/*.cpp
 	touch src/*.cpp
 	CFLAGS="-fsanitize=address -g" $(MAKE) -C src -j
@@ -76,16 +76,9 @@ gclean:
 ghidra-native:
 	git clone https://github.com/radareorg/ghidra-native
 	cd ghidra-native && git reset --hard $(GHIDRA_NATIVE_COMMIT)
-
-ghidra-native/.patched: ghidra-native
 	$(MAKE) -C ghidra-native patch
 	touch ghidra-native/.patched
 
-# mkdir -p ghidra/ghidra/Ghidra/Features/Decompiler/src/decompile/cpp
-# cp -rf ghidra-native/src/decompiler/* ghidra/ghidra/Ghidra/Features/Decompiler/src/decompile/cpp
-# mkdir -p ghidra/ghidra/Ghidra/Processors
-# cp -rf ghidra-native/src/Processors/* ghidra/ghidra/Ghidra/Processors/
-
 mrproper: clean
 	git submodule deinit --all -f
 
diff --git a/preconfigure.bat b/preconfigure.bat
index 70bd795b..07e74ee6 100644
--- a/preconfigure.bat
+++ b/preconfigure.bat
@@ -3,6 +3,6 @@ set PATH=%CD%\radare2\bin;%PATH%
 set ARCH=x64
 git submodule update --init
 
-make ghidra/ghidra/Ghidra
+make ghidra-native
 
 call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64