diff --git a/modules/lang/org/config.el b/modules/lang/org/config.el
index 6d965dcd0..c471f6376 100644
--- a/modules/lang/org/config.el
+++ b/modules/lang/org/config.el
@@ -382,6 +382,10 @@ file isn't in `org-directory'."
   (when (featurep! :lang markdown)
     (add-to-list 'org-export-backends 'md))
 
+  (use-package! ox-hugo
+    :when (featurep! +hugo)
+    :after ox)
+
   (use-package! ox-pandoc
     :when (featurep! +pandoc)
     :when (executable-find "pandoc")
@@ -880,7 +884,6 @@ compelling reason, so..."
 
   ;;; Custom org modules
   (if (featurep! +dragndrop) (load! "contrib/dragndrop"))
-  (if (featurep! +hugo)      (load! "contrib/hugo"))
   (if (featurep! +ipython)   (load! "contrib/ipython"))
   (if (featurep! +present)   (load! "contrib/present"))
 
diff --git a/modules/lang/org/contrib/hugo.el b/modules/lang/org/contrib/hugo.el
deleted file mode 100644
index b0a732c64..000000000
--- a/modules/lang/org/contrib/hugo.el
+++ /dev/null
@@ -1,5 +0,0 @@
-;;; +hugo.el --- ox-hugo support -*- lexical-binding: t; -*-
-;;;###if (featurep! +hugo)
-
-(use-package! ox-hugo
-  :after ox)