diff --git a/Makefile.am b/Makefile.am
index 437e828..8d4a990 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -10,7 +10,7 @@ if USE_NLS
 po_SUBDIRS = po
 endif
 
-SUBDIRS = $(po_SUBDIRS) libx52 lib utils daemon tests udev
+SUBDIRS = $(po_SUBDIRS) libx52 libx52util lib utils daemon tests udev
 
 # Extra files that need to be in the distribution
 EXTRA_DIST = \
diff --git a/configure.ac b/configure.ac
index 7d2ab79..72caabe 100644
--- a/configure.ac
+++ b/configure.ac
@@ -127,7 +127,7 @@ AC_CONFIG_FILES([ po/Makefile.in
     libx52/Makefile
     libx52/libx52.pc
     lib/libusbx52/Makefile
-    lib/libx52util/Makefile
+    libx52util/Makefile
     lib/libx52io/Makefile
     lib/pinelog/Makefile
     udev/Makefile
diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index a6638c4..ed5b30d 100644
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
@@ -17,7 +17,7 @@ x52d_CFLAGS = \
 	-I $(top_srcdir) \
 	-I $(top_srcdir)/lib/libx52io \
 	-I $(top_srcdir)/libx52 \
-	-I $(top_srcdir)/lib/libx52util \
+	-I $(top_srcdir)/libx52util \
 	-I $(top_srcdir)/lib/pinelog \
 	-DSYSCONFDIR=\"$(sysconfdir)\" \
 	-DLOCALEDIR=\"$(localedir)\" \
diff --git a/lib/Makefile.am b/lib/Makefile.am
index bcc95fe..2e6e4d5 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -4,5 +4,5 @@
 #
 # SPDX-License-Identifier: GPL-2.0-only WITH Classpath-exception-2.0
 
-SUBDIRS = libx52util libusbx52 libx52io pinelog
+SUBDIRS = libusbx52 libx52io pinelog
 
diff --git a/lib/libx52util/Makefile.am b/libx52util/Makefile.am
similarity index 100%
rename from lib/libx52util/Makefile.am
rename to libx52util/Makefile.am
diff --git a/lib/libx52util/libx52util.h b/libx52util/libx52util.h
similarity index 100%
rename from lib/libx52util/libx52util.h
rename to libx52util/libx52util.h
diff --git a/lib/libx52util/x52_char_map.cfg b/libx52util/x52_char_map.cfg
similarity index 100%
rename from lib/libx52util/x52_char_map.cfg
rename to libx52util/x52_char_map.cfg
diff --git a/lib/libx52util/x52_char_map.h b/libx52util/x52_char_map.h
similarity index 100%
rename from lib/libx52util/x52_char_map.h
rename to libx52util/x52_char_map.h
diff --git a/lib/libx52util/x52_char_map_gen.py b/libx52util/x52_char_map_gen.py
similarity index 100%
rename from lib/libx52util/x52_char_map_gen.py
rename to libx52util/x52_char_map_gen.py
diff --git a/lib/libx52util/x52_char_map_lookup.c b/libx52util/x52_char_map_lookup.c
similarity index 100%
rename from lib/libx52util/x52_char_map_lookup.c
rename to libx52util/x52_char_map_lookup.c