diff --git a/convert-hf-to-gguf.py b/convert-hf-to-gguf.py
index a1829a856..869eec72f 100755
--- a/convert-hf-to-gguf.py
+++ b/convert-hf-to-gguf.py
@@ -1,10 +1,15 @@
 #!/usr/bin/env python3
 
 from __future__ import annotations
+from pathlib import Path
 
+import os
 import sys
-
 import model
+
+
+if 'NO_LOCAL_GGUF' not in os.environ:
+    sys.path.insert(1, str(Path(__file__).parent / 'gguf-py' / 'gguf'))
 from util import parse_args
 
 args = parse_args()
diff --git a/util.py b/gguf-py/gguf/util.py
similarity index 100%
rename from util.py
rename to gguf-py/gguf/util.py