diff --git a/src/Makefile b/src/Makefile
index 13b36104..d1e7c79f 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -56,7 +56,7 @@ all: install
 install clean full_clean:
 	$(MAKE)  -C vendor/stp   PREFIX=$(PREFIX)  $@
 	$(MAKE)  -C vendor/yices PREFIX=$(PREFIX)  $@
-	$(MAKE)  -C vendor/htcl  PREFIX=$(PREFIX)  $@
+	$(MAKE)  -C comp/HTcl    PREFIX=$(PREFIX)  $@
 	# we need to build targets from here sequentially, as they operate in the same workspace
 	$(MAKE)  -C comp -j1   PREFIX=$(PREFIX)  $@
 	$(MAKE)  -C Libraries  PREFIX=$(PREFIX)  $@
@@ -68,4 +68,3 @@ install clean full_clean:
 	$(MAKE)  -C bluetcl    PREFIX=$(PREFIX)  $@
 	$(MAKE)  -C bluesim    PREFIX=$(PREFIX)  $@
 	$(MAKE)  -C Verilator  PREFIX=$(PREFIX)  $@
-
diff --git a/src/comp/.ghci b/src/comp/.ghci
index 13342487..4d854115 100644
--- a/src/comp/.ghci
+++ b/src/comp/.ghci
@@ -25,10 +25,10 @@
 -- Shared libraries and FFI bindings
 :set -i../vendor/stp/include_hs
 :set -i../vendor/yices/include_hs
-:set -i../vendor/htcl
+:set -iHTcl
 
 :set -I/usr/include/tcl
-:set -L../vendor/htcl
+:set -LHTcl
 :set -lhtcl
 
 :set -L../vendor/stp/lib
diff --git a/src/vendor/htcl/.gitignore b/src/comp/HTcl/.gitignore
similarity index 100%
rename from src/vendor/htcl/.gitignore
rename to src/comp/HTcl/.gitignore
diff --git a/src/vendor/htcl/HTcl.hs b/src/comp/HTcl/HTcl.hs
similarity index 100%
rename from src/vendor/htcl/HTcl.hs
rename to src/comp/HTcl/HTcl.hs
diff --git a/src/vendor/htcl/Makefile b/src/comp/HTcl/Makefile
similarity index 100%
rename from src/vendor/htcl/Makefile
rename to src/comp/HTcl/Makefile
diff --git a/src/vendor/htcl/haskell.c b/src/comp/HTcl/haskell.c
similarity index 100%
rename from src/vendor/htcl/haskell.c
rename to src/comp/HTcl/haskell.c
diff --git a/src/comp/Makefile b/src/comp/Makefile
index a6d2ada0..f16e91d6 100644
--- a/src/comp/Makefile
+++ b/src/comp/Makefile
@@ -56,7 +56,7 @@ YICES_INC_FLAGS = -I../vendor/yices/include
 YICES_LIB_FLAGS = -L../vendor/yices/lib -lyices
 
 # HTCL
-HTCL_HS = ../vendor/htcl
+HTCL_HS = HTcl
 HTCL_INC_FLAGS = -L$(HTCL_HS)
 HTCL_LIB_FLAGS = -lhtcl
 
@@ -170,7 +170,7 @@ GHCINCLUDES =  \
 GHCTMP = '-tmpdir $(TMPDIR)'
 # Default RTS flags for programs built with a Haskell main
 # 256MB heap, 10MB stack, 1 second interval between heap profiles
-# If you modify this, also update rts_opts in ../vendor/htcl/haskell.c
+# If you modify this, also update rts_opts in HTcl/haskell.c
 RTSFLAGS = "-with-rtsopts=-H256m -K10m -i1"
 FVIA ?= -fasm
 GHCFLAGS = \
diff --git a/util/haskell-language-server/gen_hie.py b/util/haskell-language-server/gen_hie.py
index ba528910..11d2b5ab 100644
--- a/util/haskell-language-server/gen_hie.py
+++ b/util/haskell-language-server/gen_hie.py
@@ -11,13 +11,13 @@
     "./Libs",
     "./GHC",
     "./GHC/posix",
+    "./Htcl",
     "./Parser",
     "./Parser/BSV",
     "./Parser/Classic",
     "./Parsec",
     "../vendor/stp/include_hs",
     "../vendor/yices/include_hs",
-    "../vendor/htcl"
 ]
 
 arguments = ["-i"]