diff --git a/installation-images-14.361.tar.xz b/installation-images-14.361.tar.xz
deleted file mode 100644
index 21d4540..0000000
--- a/installation-images-14.361.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:88f87834971b7d77b5bc7d40503aa36a903e10898680bd8842b192aa7dbff591
-size 174300
diff --git a/installation-images-14.364.tar.xz b/installation-images-14.364.tar.xz
new file mode 100644
index 0000000..92af9c0
--- /dev/null
+++ b/installation-images-14.364.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:20e57baf2a474de382f41050adff60878632fd8bccc214d680a2e799b47ce77e
+size 174360
diff --git a/installation-images.changes b/installation-images.changes
index 8070353..faa77e8 100644
--- a/installation-images.changes
+++ b/installation-images.changes
@@ -1,3 +1,24 @@
+--------------------------------------------------------------------
+Thu Mar 22 13:05:27 UTC 2018 - wfeldt@opensuse.org
+
+- merge gh#openSUSE/installation-images#239
+- add novnc & python3-websockify (bsc#1078785)
+- 14.364
+
+--------------------------------------------------------------------
+Thu Mar 22 12:15:14 UTC 2018 - wfeldt@opensuse.org
+
+- merge gh#openSUSE/installation-images#238
+- allow udevd to be run with --debug (bsc#1085212)
+- 14.363
+
+--------------------------------------------------------------------
+Fri Mar 16 12:06:05 UTC 2018 - wfeldt@opensuse.org
+
+- merge gh#openSUSE/installation-images#237
+- move tftpboot location (bsc#1085479)
+- 14.362
+
 --------------------------------------------------------------------
 Fri Mar 9 10:06:25 UTC 2018 - wfeldt@opensuse.org
 
diff --git a/installation-images.spec b/installation-images.spec
index 381c60e..c9a4c77 100644
--- a/installation-images.spec
+++ b/installation-images.spec
@@ -281,6 +281,7 @@ BuildRequires:  netpbm
 BuildRequires:  nfs-client
 BuildRequires:  nfs-kernel-server
 BuildRequires:  nfs-utils
+BuildRequires:  novnc
 BuildRequires:  ntfs-3g
 BuildRequires:  ntfsprogs
 BuildRequires:  open-iscsi
@@ -305,6 +306,7 @@ BuildRequires:  perl-XML-Simple
 BuildRequires:  perl-solv
 BuildRequires:  pinentry
 BuildRequires:  plymouth-theme-tribar
+BuildRequires:  python3-websockify
 BuildRequires:  raleway-fonts
 BuildRequires:  samba
 BuildRequires:  snapper
@@ -312,6 +314,7 @@ BuildRequires:  suse-module-tools
 BuildRequires:  systemd
 BuildRequires:  systemd-presets-branding
 BuildRequires:  sysvinit-tools
+BuildRequires:  tftpboot-installation-common
 BuildRequires:  thai-fonts
 BuildRequires:  tunctl
 BuildRequires:  udev
@@ -505,7 +508,7 @@ ExcludeArch:    %arm
 Summary:        Installation Image Files for %theme
 License:        GPL-2.0+
 Group:          Metapackages
-Version:        14.361
+Version:        14.364
 Release:        0
 Provides:       installation-images = %version-%release
 Conflicts:      otherproviders(installation-images)
@@ -654,7 +657,7 @@ echo '%dir' /usr/lib/install-initrd >>install-initrd.files
 echo /usr/sbin/mkinstallinitrd >>install-initrd.files
 # cd1
 mkdir -p %{buildroot}/usr/lib/skelcd/CD1
-cp -a %{buildroot}/srv/tftpboot/*/* %{buildroot}/usr/lib/skelcd/CD1
+cp -a %{buildroot}/usr/share/tftpboot-installation/*/* %{buildroot}/usr/lib/skelcd/CD1
 rm -f %{buildroot}/usr/lib/skelcd/CD1/boot/*/rpmlist
 rm -f %{buildroot}/usr/lib/skelcd/CD1/boot/*/mkbootdisk
 rm -rf %{buildroot}/usr/lib/skelcd/CD1/{README,net}
@@ -688,27 +691,26 @@ rm -rf %{buildroot}
 /CD1
 /SuSE
 %exclude /usr/share/debuginfodeps
-/usr/share
+/usr/share/mini-iso-rmlist
+%ifarch x86_64
+/usr/share/rescue-server
+%endif
 
 %files -n install-initrd-%{theme} -f install-initrd.files
 
 %files -n tftpboot-installation-%{product_name}
 %defattr(-,root,root)
-%dir %attr(0755,tftp,tftp) /srv/tftpboot
-/srv/tftpboot
+%dir %attr(0755,tftp,tftp) /usr/share/tftpboot-installation
+/usr/share/tftpboot-installation
 
 %files -n skelcd-installer-%{theme}
 %defattr(-,root,root)
-%if 0%{?skelcd_compat}
 %dir /usr/lib/skelcd
-%endif
 /usr/lib/skelcd/CD1
 
 %files -n skelcd-installer-net-%{theme}
 %defattr(-,root,root)
-%if 0%{?skelcd_compat}
 %dir /usr/lib/skelcd
-%endif
 /usr/lib/skelcd/NET
 
 %files -n installation-images-debuginfodeps-%{theme}