diff --git a/meta-openembedded/meta-webserver/recipes-webadmin/cockpit/files/0001-remove-tests-dep-on-gobject-intro.patch b/meta-openembedded/meta-webserver/recipes-webadmin/cockpit/files/0001-remove-tests-dep-on-gobject-intro.patch
new file mode 100644
index 0000000..2242190
--- /dev/null
+++ b/meta-openembedded/meta-webserver/recipes-webadmin/cockpit/files/0001-remove-tests-dep-on-gobject-intro.patch
@@ -0,0 +1,77 @@
+From 788aace494f79e8201b18ebcdf1592b5030c5295 Mon Sep 17 00:00:00 2001
+From: Adrian Freihofer <adrian.freihofer@siemens.com>
+Date: Wed, 4 Dec 2019 17:23:46 +0100
+Subject: [PATCH] remove tests dep on gobject-intro
+
+---
+ src/ws/Makefile-ws.am | 54 ---------------------------------------------------
+ 1 file changed, 54 deletions(-)
+
+diff --git a/src/ws/Makefile-ws.am b/src/ws/Makefile-ws.am
+index 009130941..34e13d7fe 100644
+--- a/src/ws/Makefile-ws.am
++++ b/src/ws/Makefile-ws.am
+@@ -246,60 +246,6 @@ EXTRA_DIST += \
+ 
+ # ----------------------------------------------------------------------------------------------------
+ 
+-noinst_PROGRAMS += test-server
+-check_PROGRAMS += test-server
+-
+-GDBUS_CODEGEN_XML = $(srcdir)/src/ws/com.redhat.Cockpit.DBusTests.xml
+-
+-GDBUS_CODEGEN_GENERATED = \
+-	src/ws/mock-dbus-tests.h \
+-	src/ws/mock-dbus-tests.c \
+-	$(NULL)
+-
+-# FIXME: --header/--body and --output are only available from GLib 2.56.
+-# just use --generate-c-code and a bit of dependency ugliness for now
+-GDBUS_CODEGEN_INVOCATION = \
+-	$(AM_V_GEN) gdbus-codegen \
+-	--interface-prefix com.redhat.Cockpit.DBusTests \
+-	--c-namespace Test \
+-	--c-generate-object-manager \
+-	--generate-c-code src/ws/mock-dbus-tests \
+-	$(GDBUS_CODEGEN_XML)
+-
+-BUILT_SOURCES += $(GDBUS_CODEGEN_GENERATED)
+-CLEANFILES += $(GDBUS_CODEGEN_GENERATED)
+-EXTRA_DIST += $(GDBUS_CODEGEN_XML)
+-
+-src/ws/mock-dbus-tests.h: $(GDBUS_CODEGEN_XML)
+-	$(GDBUS_CODEGEN_INVOCATION)
+-
+-src/ws/mock-dbus-tests.c: $(GDBUS_CODEGEN_XML) src/ws/mock-dbus-tests.h
+-	$(GDBUS_CODEGEN_INVOCATION)
+-
+-test_server_SOURCES = \
+-	src/ws/mock-service.c \
+-	src/ws/mock-service.h \
+-	src/ws/test-server.c \
+-	$(NULL)
+-
+-nodist_test_server_SOURCES = \
+-	$(GDBUS_CODEGEN_GENERATED) \
+-	$(NULL)
+-
+-test_server_CFLAGS = 					\
+-	-I$(builddir)/src/ws \
+-	-I$(top_srcdir)/src/ws \
+-	-DG_LOG_DOMAIN=\"test-server\"			\
+-	$(GIO_CFLAGS)					\
+-	$(COCKPIT_WS_CFLAGS) \
+-	$(NULL)
+-
+-test_server_LDADD = 					\
+-	$(libcockpit_ws_LIBS) \
+-	$(GIO_LIBS)					\
+-	-lpam 						\
+-	$(NULL)
+-
+ WS_CHECKS = \
+ 	test-base64 \
+ 	test-creds \
+-- 
+2.11.0
+
diff --git a/meta-openembedded/meta-webserver/recipes-webadmin/cockpit/files/0002-fix-makefile-use-copy-rule-for-unmodified-files.patch b/meta-openembedded/meta-webserver/recipes-webadmin/cockpit/files/0002-fix-makefile-use-copy-rule-for-unmodified-files.patch
new file mode 100644
index 0000000..a1ea9bc
--- /dev/null
+++ b/meta-openembedded/meta-webserver/recipes-webadmin/cockpit/files/0002-fix-makefile-use-copy-rule-for-unmodified-files.patch
@@ -0,0 +1,47 @@
+From 1edf0756bf4fd002f5b60cf2b86d4b97a00aff20 Mon Sep 17 00:00:00 2001
+From: Michael Haener <michael.haener@siemens.com>
+Date: Wed, 25 Mar 2020 08:32:07 +0100
+Subject: [PATCH] fix(makefile): use copy rule for unmodified files
+
+---
+ pkg/Makefile.am | 27 +++++++++++++++++++++++++++
+ 1 file changed, 27 insertions(+)
+
+diff --git a/pkg/Makefile.am b/pkg/Makefile.am
+index 192b785..03b9787 100644
+--- a/pkg/Makefile.am
++++ b/pkg/Makefile.am
+@@ -13,6 +13,33 @@ playground_DATA = \
+ dist/playground/extra.de.po: pkg/playground/extra.de.po
+ 	$(COPY_RULE)
+ 
++dist/playground/hammer.gif: pkg/playground/hammer.gif
++	$(COPY_RULE)
++
++dist/sosreport/sosreport.png: pkg/sosreport/sosreport.png
++	$(COPY_RULE)
++
++dist/apps/default.png: pkg/apps/default.png
++	$(COPY_RULE)
++
++dist/storaged/images/storage-array.png: pkg/storaged/images/storage-array.png
++	$(COPY_RULE)
++
++dist/storaged/images/storage-disk.png: pkg/storaged/images/storage-disk.png
++	$(COPY_RULE)
++
++dist/shell/images/server-error.png: pkg/shell/images/server-error.png
++	$(COPY_RULE)
++
++dist/shell/images/server-large.png: pkg/shell/images/server-large.png
++	$(COPY_RULE)
++
++dist/shell/images/server-small.png: pkg/shell/images/server-small.png
++	$(COPY_RULE)
++
++dist/shell/index.html: pkg/shell/index.html
++	$(COPY_RULE)
++
+ metainfodir = ${datarootdir}/metainfo
+ metainfo_DATA = pkg/sosreport/org.cockpit-project.cockpit-sosreport.metainfo.xml \
+ 		pkg/kdump/org.cockpit-project.cockpit-kdump.metainfo.xml \
diff --git a/meta-openembedded/meta-webserver/recipes-webadmin/cockpit/files/0003-install-fix-metainfo.xml-ownership-on-install.patch b/meta-openembedded/meta-webserver/recipes-webadmin/cockpit/files/0003-install-fix-metainfo.xml-ownership-on-install.patch
new file mode 100644
index 0000000..b967b1c
--- /dev/null
+++ b/meta-openembedded/meta-webserver/recipes-webadmin/cockpit/files/0003-install-fix-metainfo.xml-ownership-on-install.patch
@@ -0,0 +1,30 @@
+From e56f2b294ca8c805bfd3d715d523bef188c54cb1 Mon Sep 17 00:00:00 2001
+From: Emmanuel Roullit <emmanuel.roullit@gmail.com>
+Date: Sat, 2 May 2020 14:05:35 +0200
+Subject: [PATCH] install: fix metainfo.xml ownership on install
+
+Signed-off-by: Emmanuel Roullit <emmanuel.roullit@gmail.com>
+---
+ Makefile.am | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index d9f918e99..9a23e0a7b 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -226,10 +226,10 @@ maintainer-clean-local::
+ 
+ install-data-local:: $(WEBPACK_INSTALL)
+ 	$(MKDIR_P) $(DESTDIR)$(pkgdatadir)
+-	tar -cf - $^ | tar -C $(DESTDIR)$(pkgdatadir) --strip-components=1 -xvf -
++	tar -cf - $^ | tar --no-same-owner -C $(DESTDIR)$(pkgdatadir) --strip-components=1 -xvf -
+ install-data-local:: $(WEBPACK_DEBUG)
+ 	$(MKDIR_P) $(DESTDIR)$(debugdir)$(pkgdatadir)
+-	tar -cf - $^ | tar -C $(DESTDIR)$(debugdir)$(pkgdatadir) --strip-components=1 -xvf -
++	tar -cf - $^ | tar --no-same-owner -C $(DESTDIR)$(debugdir)$(pkgdatadir) --strip-components=1 -xvf -
+ uninstall-local::
+ 	find $(DESTDIR)$(pkgdatadir) -ignore_readdir_race -type f -exec rm -f {} \;
+ 	find $(DESTDIR)$(pkgdatadir) -ignore_readdir_race -type d -empty -delete
+-- 
+2.17.1
+
diff --git a/meta-openembedded/meta-webserver/recipes-webadmin/cockpit/files/cockpit.pam b/meta-openembedded/meta-webserver/recipes-webadmin/cockpit/files/cockpit.pam
new file mode 100644
index 0000000..dd09e29
--- /dev/null
+++ b/meta-openembedded/meta-webserver/recipes-webadmin/cockpit/files/cockpit.pam
@@ -0,0 +1,8 @@
+#%PAM-1.0
+auth        required      pam_unix.so     nullok
+
+account     required      pam_unix.so
+
+-session    optional      pam_systemd.so
+session     required      pam_unix.so
+session     optional      pam_keyinit.so force revoke