diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 587159b..570b421 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -24,6 +24,7 @@ Build Docker Images:
           - macos-x86_64
           - macos-aarch64
           - dind
+          - windows
   script:
     - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD registry.gitlab.com
     - make docker-$DISTRO
@@ -45,7 +46,8 @@ Build:
           - fedora36
           - macos-x86_64
           - macos-aarch64
-  image: registry.gitlab.com/librewolf-community/browser/bsys5/dind
+          - windows
+  image: registry.gitlab.com/librewolf-community/browser/bsys5/$DISTRO
   tags:
     - autoscale
   except:
@@ -64,6 +66,10 @@ Build:
       - librewolf-*.rpm.sha256sum
       - librewolf-*.dmg
       - librewolf-*.dmg.sha256sum
+      - librewolf-*-setup.exe
+      - librewolf-*-setup.exe.sha256sum
+      - librewolf-*-portable.zip
+      - librewolf-*-portable.zip.sha256sum
     reports:
       dotenv: variables.env
 
diff --git a/Makefile b/Makefile
index 65bb7da..ab87398 100644
--- a/Makefile
+++ b/Makefile
@@ -19,6 +19,7 @@ help :
 	@echo "  [docker-macos-x86_64], [docker-macos-aarch64]"
 	@echo "  [docker-tumbleweed]"
 	@echo "  [docker-dind]"
+	@echo "  [docker-windows]"
 	@echo ""
 	@echo "build targets:" 
 	@echo "  [debian11], [mint20], [mint21], [ubuntu20], [ubuntu21]"
@@ -26,6 +27,7 @@ help :
 	@echo "  [fedora37], [fedora36]"
 	@echo "  [macos-x64_64], [macos-aarch64]"
 	@echo "  [tumbleweed]"
+	@echo "  [windows]"
 	@echo "  [tarball]"
 	@echo ""
 
@@ -70,6 +72,8 @@ build :
 	${MAKE} clean
 	${MAKE} macos-aarch64
 	${MAKE} clean
+	${MAKE} windows
+	${MAKE} clean
 
 push :
 	docker push registry.gitlab.com/librewolf-community/browser/bsys5/debian11
@@ -210,6 +214,11 @@ docker-macos-aarch64 :
 macos-aarch64 :
 	${MAKE} -f assets/macos.mk arch=aarch64 build
 
+## windows
+docker-windows :
+	${MAKE} -f assets/windows.mk docker
+windows :
+	${MAKE} -f assets/windows.mk build
 
 #
 # Docker in Docker (for GitLab CI)
diff --git a/assets/windows.Dockerfile b/assets/windows.Dockerfile
new file mode 100644
index 0000000..bc50d89
--- /dev/null
+++ b/assets/windows.Dockerfile
@@ -0,0 +1,11 @@
+FROM ubuntu:latest
+RUN apt-get -y update && apt-get -y upgrade && apt-get -y install bash git wget build-essential zip
+RUN dpkg --add-architecture i386 && apt-get -y update && apt-get -y install wine32
+
+WORKDIR /root
+RUN git clone https://gitlab.com/librewolf-community/browser/windows.git
+WORKDIR /root/windows/linux
+
+RUN make setup-debian
+RUN make fetch
+RUN make bootstrap
diff --git a/assets/windows.mk b/assets/windows.mk
new file mode 100644
index 0000000..9e32a4b
--- /dev/null
+++ b/assets/windows.mk
@@ -0,0 +1,38 @@
+# windows.mk - this one is quite a bit different from the others,
+# but we can fix that later.
+
+.PHONY : docker build
+
+version:=$(shell cat version)
+release:=$(shell cat release)
+source_release:=$(shell cat source_release)
+full_version:=$(version)-$(source_release)$(shell [ $(release) -gt 1 ] && echo "-$(release)")
+
+outfile-exe=librewolf-$(full_version).en-US.win64-setup.exe
+outfile-zip=librewolf-$(full_version).en-US.win64-portable.zip
+outfiles=$(outfile-exe) $(outfile-zip)
+
+distro=windows
+image=registry.gitlab.com/librewolf-community/browser/bsys5/$(distro):latest
+
+docker :
+
+	docker build -t $(image) - < assets/windows.Dockerfile
+
+build :
+
+	pwd
+	rm -rf windows
+	git clone https://gitlab.com/librewolf-community/browser/windows.git
+
+	( cd windows/linux && \
+	  pwd && \
+	  ${MAKE} fetch && \
+	  ${MAKE} all && \
+	  cp -v $(outfiles) ../.. )
+
+	sha256sum $(outfile-exe) > $(outfile-exe).sha256sum
+	cat $(outfile-exe).sha256sum
+	sha256sum $(outfile-zip) > $(outfile-zip).sha256sum
+	cat $(outfile-zip).sha256sum
+