diff --git a/Makefile b/Makefile
index 2fe49d06a..b4a414f85 100644
--- a/Makefile
+++ b/Makefile
@@ -28,6 +28,7 @@ SUBDIR += src/fsm
 SUBDIR += src/re
 SUBDIR += src/lx
 SUBDIR += src/lx/out
+SUBDIR += pc
 
 INCDIR += include
 
@@ -36,6 +37,7 @@ INCDIR += include
 DIR += ${BUILD}/lib
 
 .include <subdir.mk>
+.include <pc.mk>
 .include <sid.mk>
 .include <lx.mk>
 .include <obj.mk>
diff --git a/pc/Makefile b/pc/Makefile
new file mode 100644
index 000000000..dabe61a1f
--- /dev/null
+++ b/pc/Makefile
@@ -0,0 +1,5 @@
+.include "../share/mk/top.mk"
+
+PC += pc/libfsm.pc.in
+PC += pc/libre.pc.in
+
diff --git a/pc/libfsm.pc.in b/pc/libfsm.pc.in
new file mode 100644
index 000000000..5e6207db3
--- /dev/null
+++ b/pc/libfsm.pc.in
@@ -0,0 +1,13 @@
+prefix=@prefix@
+libdir=${prefix}/lib
+includedir=${prefix}/include
+
+Name: libfsm
+Description: Finite State Machines
+Version: 0.1
+Requires:
+Requires.private:
+Libs: -L${libdir} -lfsm
+Libs.private:
+Cflags: -I${includedir}
+
diff --git a/pc/libre.pc.in b/pc/libre.pc.in
new file mode 100644
index 000000000..ce7e50068
--- /dev/null
+++ b/pc/libre.pc.in
@@ -0,0 +1,13 @@
+prefix=@prefix@
+libdir=${prefix}/lib
+includedir=${prefix}/include
+
+Name: libre
+Description: Regular Expressions
+Version: 0.1
+Requires:
+Requires.private: libfsm
+Libs: -L${libdir} -lre
+Libs.private: -lfsm
+Cflags: -I${includedir}
+
diff --git a/share/git/kmkf b/share/git/kmkf
index 26801ccaf..6554723d0 160000
--- a/share/git/kmkf
+++ b/share/git/kmkf
@@ -1 +1 @@
-Subproject commit 26801ccaf6639f5da0033eead6f645bf45040310
+Subproject commit 6554723d0d3d7bb0f43187fca115e697065039e0