@@ -146,11 +146,11 @@
 %prep
 %autosetup
 ./autogen.sh
 
 %build
-%configure OBJC=clang --disable-rpath
+%configure OBJC=clang --disable-rpath --with-fish-completions
 %make_build
 
 %install
 %make_install
 
@@ -163,86 +163,88 @@
 %post -n %{libobjfwrt_pkgname} -p /sbin/ldconfig
 %postun -n %{libobjfwrt_pkgname} -p /sbin/ldconfig
 %endif
 
 %files
-%license LICENSE.QPL
+%license LICENSE.GPLv2
 %license LICENSE.GPLv3
-%license LICENSE.GPLv2
+%license LICENSE.QPL
 
 %files -n %{libobjfw_pkgname}
+%license LICENSE.GPLv2
+%license LICENSE.GPLv3
+%license LICENSE.QPL
 %{_libdir}/libobjfw.so.%{libobjfw_major}
 %{_libdir}/libobjfw.so.%{libobjfw_major}.%{libobjfw_minor}.0
-%license LICENSE.QPL
-%license LICENSE.GPLv3
-%license LICENSE.GPLv2
 
 %files -n %{libobjfw_pkgname}-devel
-%{_libdir}/libobjfw.so
-%dir %{_includedir}/ObjFW
-%{_includedir}/ObjFW
+%license LICENSE.GPLv2
+%license LICENSE.GPLv3
+%license LICENSE.QPL
 %{_bindir}/objfw-compile
 %{_bindir}/objfw-config
+%{_bindir}/objfw-embed
 %{_bindir}/objfw-new
-%license LICENSE.QPL
-%license LICENSE.GPLv3
-%license LICENSE.GPLv2
+%{_datadir}/fish/vendor_completions.d/objfw-compile.fish
+%{_datadir}/fish/vendor_completions.d/objfw-config.fish
+%{_includedir}/ObjFW
+%{_libdir}/libobjfw.so
 
 %files -n %{libobjfwrt_pkgname}
+%license LICENSE.GPLv2
+%license LICENSE.GPLv3
+%license LICENSE.QPL
 %{_libdir}/libobjfwrt.so.%{libobjfwrt_major}
 %{_libdir}/libobjfwrt.so.%{libobjfwrt_major}.%{libobjfwrt_minor}.0
-%license LICENSE.QPL
-%license LICENSE.GPLv3
-%license LICENSE.GPLv2
 
 %files -n %{libobjfwrt_pkgname}-devel
-%{_libdir}/libobjfwrt.so
-%{_includedir}/ObjFWRT/ObjFWRT.h
+%license LICENSE.GPLv2
+%license LICENSE.GPLv3
 %license LICENSE.QPL
-%license LICENSE.GPLv3
-%license LICENSE.GPLv2
+%{_includedir}/ObjFWRT
+%{_libdir}/libobjfwrt.so
 
 %files -n %{libobjfwtls_pkgname}
+%license LICENSE.GPLv2
+%license LICENSE.GPLv3
+%license LICENSE.QPL
 %{_libdir}/libobjfwtls.so.%{libobjfwtls_major}
 %{_libdir}/libobjfwtls.so.%{libobjfwtls_major}.%{libobjfwtls_minor}.0
-%license LICENSE.QPL
-%license LICENSE.GPLv3
-%license LICENSE.GPLv2
 
 %files -n %{libobjfwtls_pkgname}-devel
-%{_libdir}/libobjfwtls.so
-%{_includedir}/ObjFWTLS/ObjFWTLS.h
+%license LICENSE.GPLv2
+%license LICENSE.GPLv3
 %license LICENSE.QPL
-%license LICENSE.GPLv3
-%license LICENSE.GPLv2
+%{_includedir}/ObjFWTLS
+%{_libdir}/libobjfwtls.so
 
 %files -n ofarc
-%{_bindir}/ofarc
-%{_datadir}/ofarc/lang/de.json
-%{_datadir}/ofarc/lang/languages.json
+%license LICENSE.GPLv2
+%license LICENSE.GPLv3
 %license LICENSE.QPL
-%license LICENSE.GPLv3
-%license LICENSE.GPLv2
+%{_bindir}/ofarc
+%{_datadir}/fish/vendor_completions.d/ofarc.fish
+%{_datadir}/ofarc
 
 %files -n ofdns
-%{_bindir}/ofdns
-%{_datadir}/ofdns/lang/de.json
-%{_datadir}/ofdns/lang/languages.json
+%license LICENSE.GPLv2
+%license LICENSE.GPLv3
 %license LICENSE.QPL
-%license LICENSE.GPLv3
-%license LICENSE.GPLv2
+%{_bindir}/ofdns
+%{_datadir}/fish/vendor_completions.d/ofdns.fish
+%{_datadir}/ofdns
 
 %files -n ofhash
-%{_bindir}/ofhash
-%{_datadir}/ofhash/lang/de.json
-%{_datadir}/ofhash/lang/languages.json
+%license LICENSE.GPLv2
+%license LICENSE.GPLv3
 %license LICENSE.QPL
-%license LICENSE.GPLv3
-%license LICENSE.GPLv2
+%{_bindir}/ofhash
+%{_datadir}/fish/vendor_completions.d/ofhash.fish
+%{_datadir}/ofhash
 
 %files -n ofhttp
-%{_bindir}/ofhttp
-%{_datadir}/ofhttp/lang/de.json
-%{_datadir}/ofhttp/lang/languages.json
+%license LICENSE.GPLv2
+%license LICENSE.GPLv3
 %license LICENSE.QPL
-%license LICENSE.GPLv3
-%license LICENSE.GPLv2
+%{_bindir}/ofhttp
+%{_datadir}/fish/vendor_completions.d/ofhttp.fish
+%{_datadir}/ofhttp