diff --git a/pkg/gen.lua b/pkg/gen.lua
index ee99f62f..4a283760 100644
--- a/pkg/gen.lua
+++ b/pkg/gen.lua
@@ -131,6 +131,7 @@ subgen 'u-boot'
 subgen 'u-config'
 subgen 'ubase'
 subgen 'unbound'
+subgen 'unifdef'
 subgen 'unzip'
 subgen 'usbids'
 subgen 'utf8proc'
diff --git a/pkg/libffi/gen.lua b/pkg/libffi/gen.lua
index e9b04888..8dfb1a17 100644
--- a/pkg/libffi/gen.lua
+++ b/pkg/libffi/gen.lua
@@ -1,6 +1,6 @@
 local targets = {
 	aarch64={name='AARCH64', dir='aarch64'},
-	riscv64={name='RISCV', dir='riscv64'},
+	riscv64={name='RISCV', dir='riscv'},
 	x86_64={name='X86_64', dir='x86'},
 }
 local arch = config.target.platform:match('[^-]*')
diff --git a/pkg/unifdef/.gitignore b/pkg/unifdef/.gitignore
new file mode 100644
index 00000000..a57582cc
--- /dev/null
+++ b/pkg/unifdef/.gitignore
@@ -0,0 +1 @@
+/src
diff --git a/pkg/unifdef/gen.lua b/pkg/unifdef/gen.lua
new file mode 100644
index 00000000..d412985d
--- /dev/null
+++ b/pkg/unifdef/gen.lua
@@ -0,0 +1,11 @@
+cflags{
+	'-std=gnu99',
+	'-I $dir',
+}
+exe('unifdef', {'unifdef.c'})
+file('bin/unifdef', '755', '$outdir/unifdef')
+file('bin/unifdefall', '755', '$srcdir/unifdefall.sh')
+man{'unifdef.1'}
+sym('share/man/man1/unifdefall.1.gz', 'unifdef.1.gz')
+
+fetch 'curl'
diff --git a/pkg/unifdef/sha256 b/pkg/unifdef/sha256
new file mode 100644
index 00000000..8028eeaf
--- /dev/null
+++ b/pkg/unifdef/sha256
@@ -0,0 +1 @@
+fba564a24db7b97ebe9329713ac970627b902e5e9e8b14e19e024eb6e278d10b  unifdef-2.12.tar.gz
diff --git a/pkg/unifdef/url b/pkg/unifdef/url
new file mode 100644
index 00000000..ff9c51cc
--- /dev/null
+++ b/pkg/unifdef/url
@@ -0,0 +1 @@
+url = "https://dotat.at/prog/unifdef/unifdef-2.12.tar.gz"
diff --git a/pkg/unifdef/ver b/pkg/unifdef/ver
new file mode 100644
index 00000000..3e162f02
--- /dev/null
+++ b/pkg/unifdef/ver
@@ -0,0 +1 @@
+2.12
diff --git a/pkg/unifdef/version.h b/pkg/unifdef/version.h
new file mode 100644
index 00000000..28ab8595
--- /dev/null
+++ b/pkg/unifdef/version.h
@@ -0,0 +1,2 @@
+"@(#) $Version: unifdef-2.12 $\n"
+"@(#) $Date: 2020-02-14 16:37:16 +0000 $\n"
diff --git a/sets.lua b/sets.lua
index cb0715b3..cb1a8612 100644
--- a/sets.lua
+++ b/sets.lua
@@ -55,6 +55,7 @@ return {
 		'nasm',
 		'qbe',
 		'strace',
+		'unifdef',
 		'wayland',
 	},
 	media={