diff --git a/projects/qubes-os/Dockerfile b/projects/qubes-os/Dockerfile
index b6cd045f8..8cabc38ec 100644
--- a/projects/qubes-os/Dockerfile
+++ b/projects/qubes-os/Dockerfile
@@ -21,8 +21,10 @@ RUN apt-get update && apt-get -y install build-essential automake libtool git py
 
 WORKDIR qubes-os
 
-RUN git        clone --single-branch https://github.com/QubesOS/qubes-app-linux-input-proxy $SRC/qubes-os/app-linux-input-proxy
+RUN git clone --single-branch https://github.com/QubesOS/qubes-app-linux-input-proxy $SRC/qubes-os/app-linux-input-proxy
 
 RUN git clone --single-branch https://github.com/QubesOS/qubes-core-qubesdb $SRC/qubes-os/qubes-core-qubesdb
 
+RUN git clone --single-branch https://github.com/QubesOS/qubes-core-qrexec $SRC/qubes-os/qubes-core-qrexec
+
 COPY build.sh *.options $SRC/
diff --git a/projects/qubes-os/build.sh b/projects/qubes-os/build.sh
index 372a47843..09cb2d95d 100644
--- a/projects/qubes-os/build.sh
+++ b/projects/qubes-os/build.sh
@@ -17,7 +17,7 @@
 
 if [ "$SANITIZER" != 'undefined' ]; then
 	cd $SRC/qubes-os/app-linux-input-proxy
- 
+
 	make -C fuzz
 	cp fuzz/*_fuzzer $OUT/
 	cp fuzz/*_seed_corpus.zip $OUT/
@@ -30,3 +30,10 @@ make -C fuzz
 cp fuzz/*_fuzzer $OUT/
 cp fuzz/*_seed_corpus.zip $OUT/
 cp fuzz/*.options $OUT/
+
+cd $SRC/qubes-os/qubes-core-qrexec
+
+make -C fuzz
+cp fuzz/*_fuzzer $OUT/
+cp fuzz/*_seed_corpus.zip $OUT/
+cp fuzz/*.options $OUT/
diff --git a/projects/qubes-os/project.yaml b/projects/qubes-os/project.yaml
index b02241d81..b05c9d098 100644
--- a/projects/qubes-os/project.yaml
+++ b/projects/qubes-os/project.yaml
@@ -2,9 +2,8 @@ homepage: "https://www.qubes-os.org/"
 language: c++
 primary_contact: "jpo@vt.edu"
 auto_ccs:
- - "joanna@invisiblethingslab.com"
  - "marmarek@invisiblethingslab.com"
- - "paras.chetal@gmail.com"
+ - "pawel@invisiblethingslab.com"
 fuzzing_engines:
   - libfuzzer
   - afl