diff -Nru gcc-mingw-w64-19.1/debian/changelog gcc-mingw-w64-19.2/debian/changelog
--- gcc-mingw-w64-19.1/debian/changelog	2016-08-20 15:24:54.000000000 +0000
+++ gcc-mingw-w64-19.2/debian/changelog	2016-11-19 23:11:26.000000000 +0000
@@ -1,3 +1,14 @@
+gcc-mingw-w64 (19.2) unstable; urgency=medium
+
+  * Enable libatomic, using Richard Purdie's patch from
+    https://gcc.gnu.org/bugzilla/show_bug.cgi?id=55930 (Closes: #844617).
+  * Add more spelling fixes.
+  * Disable the bootstrap package for now, the bootstrap sequence is
+    broken (#838879) and having a bootstrap package entails a trip through
+    NEW for every upload.
+
+ -- Stephen Kitt <skitt@debian.org>  Sun, 20 Nov 2016 00:11:26 +0100
+
 gcc-mingw-w64 (19.1) unstable; urgency=medium
 
   * Upload to unstable.
diff -Nru gcc-mingw-w64-19.1/debian/control gcc-mingw-w64-19.2/debian/control
--- gcc-mingw-w64-19.1/debian/control	2016-08-20 15:24:54.000000000 +0000
+++ gcc-mingw-w64-19.2/debian/control	2016-11-19 23:11:26.000000000 +0000
@@ -293,19 +293,3 @@
  .
  This empty package contains the documentation common to all
  gcc-mingw-w64 packages.
-
-Package: gcc-mingw-w64-bootstrap
-Architecture: any
-Depends: binutils-mingw-w64,
-         ${misc:Depends},
-         ${shlibs:Depends}
-Built-Using: gcc-6 (= ${gcc:Version})
-Description: GNU Compiler Collection for MinGW-w64
- MinGW-w64 provides a development and runtime environment for 32- and
- 64-bit Windows applications using the GNU Compiler Collection (gcc).
- .
- This package contains the GNU Compiler Collection, supporting
- cross-compiling to 32- and 64-bit MinGW-w64 targets. The bootstrap
- version of the package contains only the minimal C compiler required
- to build MinGW-w64.
-Build-Profiles: <stage1>
diff -Nru gcc-mingw-w64-19.1/debian/gcc-mingw-w64-i686.install gcc-mingw-w64-19.2/debian/gcc-mingw-w64-i686.install
--- gcc-mingw-w64-19.1/debian/gcc-mingw-w64-i686.install	2016-08-20 15:24:54.000000000 +0000
+++ gcc-mingw-w64-19.2/debian/gcc-mingw-w64-i686.install	2016-11-18 22:20:05.000000000 +0000
@@ -15,6 +15,7 @@
 usr/lib/gcc/i686-w64-mingw32/6*/include/*.h
 usr/lib/gcc/i686-w64-mingw32/6*/include/ssp/*
 usr/lib/gcc/i686-w64-mingw32/6*/install-tools/*
+usr/lib/gcc/i686-w64-mingw32/6*/libatomic*
 usr/lib/gcc/i686-w64-mingw32/6*/libgcc.a
 usr/lib/gcc/i686-w64-mingw32/6*/libgcc_eh.a
 usr/lib/gcc/i686-w64-mingw32/6*/libgcc_s.a
diff -Nru gcc-mingw-w64-19.1/debian/gcc-mingw-w64-x86-64.install gcc-mingw-w64-19.2/debian/gcc-mingw-w64-x86-64.install
--- gcc-mingw-w64-19.1/debian/gcc-mingw-w64-x86-64.install	2016-08-20 15:24:54.000000000 +0000
+++ gcc-mingw-w64-19.2/debian/gcc-mingw-w64-x86-64.install	2016-11-18 22:20:35.000000000 +0000
@@ -15,6 +15,7 @@
 usr/lib/gcc/x86_64-w64-mingw32/6*/include/*.h
 usr/lib/gcc/x86_64-w64-mingw32/6*/include/ssp/*
 usr/lib/gcc/x86_64-w64-mingw32/6*/install-tools/*
+usr/lib/gcc/x86_64-w64-mingw32/6*/libatomic*
 usr/lib/gcc/x86_64-w64-mingw32/6*/libgcc.a
 usr/lib/gcc/x86_64-w64-mingw32/6*/libgcc_eh.a
 usr/lib/gcc/x86_64-w64-mingw32/6*/libgcc_s.a
diff -Nru gcc-mingw-w64-19.1/debian/patches/bug-55930.patch gcc-mingw-w64-19.2/debian/patches/bug-55930.patch
--- gcc-mingw-w64-19.1/debian/patches/bug-55930.patch	1970-01-01 00:00:00.000000000 +0000
+++ gcc-mingw-w64-19.2/debian/patches/bug-55930.patch	2016-11-18 07:54:52.000000000 +0000
@@ -0,0 +1,24 @@
+--- gcc-4.8.1.orig/libatomic/Makefile.am	2013-01-14 18:16:23.000000000 +0000
++++ gcc-4.8.1.orig/libatomic/Makefile.am	2013-09-22 10:38:18.904064750 +0000
+@@ -100,7 +100,8 @@ 
+ IFUNC_DEF	= -DIFUNC_ALT=$(PAT_S)
+ IFUNC_OPT	= $(word $(PAT_S),$(IFUNC_OPTIONS))
+ 
+-M_DEPS		= -MT $@ -MD -MP -MF $(DEPDIR)/$(@F).Ppo
++@AMDEP_TRUE@M_DEPS		= -MT $@ -MD -MP -MF $(DEPDIR)/$(@F).Ppo
++@AMDEP_FALSE@M_DEPS		= 
+ M_SIZE		= -DN=$(PAT_N)
+ M_IFUNC		= $(if $(PAT_S),$(IFUNC_DEF) $(IFUNC_OPT))
+ M_FILE		= $(PAT_BASE)_n.c
+--- gcc-4.8.1.orig/libatomic/Makefile.in	2013-05-31 09:09:26.000000000 +0000
++++ gcc-4.8.1.orig/libatomic/Makefile.in	2013-09-22 10:40:42.520059917 +0000
+@@ -298,7 +298,8 @@ 
+ PAT_S = $(word 3,$(PAT_SPLIT))
+ IFUNC_DEF = -DIFUNC_ALT=$(PAT_S)
+ IFUNC_OPT = $(word $(PAT_S),$(IFUNC_OPTIONS))
+-M_DEPS = -MT $@ -MD -MP -MF $(DEPDIR)/$(@F).Ppo
++@AMDEP_TRUE@M_DEPS = -MT $@ -MD -MP -MF $(DEPDIR)/$(@F).Ppo
++@AMDEP_FALSE@M_DEPS = 
+ M_SIZE = -DN=$(PAT_N)
+ M_IFUNC = $(if $(PAT_S),$(IFUNC_DEF) $(IFUNC_OPT))
+ M_FILE = $(PAT_BASE)_n.c
diff -Nru gcc-mingw-w64-19.1/debian/rules gcc-mingw-w64-19.2/debian/rules
--- gcc-mingw-w64-19.1/debian/rules	2016-08-20 15:24:54.000000000 +0000
+++ gcc-mingw-w64-19.2/debian/rules	2016-11-19 23:09:39.000000000 +0000
@@ -77,8 +77,8 @@
 	done
 	echo >> debian/control
 	cat debian/control.base >> debian/control
-	echo >> debian/control
-	cat debian/control.bootstrap >> debian/control
+#	echo >> debian/control
+#	cat debian/control.bootstrap >> debian/control
 	sed -i '/^Recommends: $$/d' debian/control
 	sed -i '/^Breaks: $$/d' debian/control
 	sed -i '/^Conflicts: $$/d' debian/control
@@ -159,6 +159,7 @@
 	# need to be applied before gcc-6-source's
 	patch -p0 < debian/patches/disable-multilib.patch
 	patch -p2 -d$(upstream_dir) < debian/patches/reproducible-sort.patch
+	patch -p1 -d$(upstream_dir) < debian/patches/bug-55930.patch
 	mkdir -p $(stampdir)
 	touch $@
 
@@ -209,9 +210,9 @@
 	--target=$$target \
 	--with-as=/usr/bin/$$target-as \
 	--with-ld=/usr/bin/$$target-ld
-# Disable libatomic
+# Enable libatomic
 CONFFLAGS += \
-	--disable-libatomic
+	--enable-libatomic
 
 spelling = grep -rl "$(1)" $(upstream_dir) | xargs -r sed -i "s/$(1)/$(2)/g"
 
@@ -225,6 +226,7 @@
 	$(call spelling,adress,address)
 	$(call spelling,Allow to,Allow one to)
 	$(call spelling,Choosen,Chosen)
+	$(call spelling,classess,classes)
 	$(call spelling,containg,containing)
 	$(call spelling,endianess,endianness)
 	$(call spelling,eroneous,erroneous)
@@ -234,8 +236,10 @@
 	$(call spelling,invokations,invocations)
 	$(call spelling,occured,occurred)
 	$(call spelling,refrence,reference)
+	$(call spelling,Regsitered,Registered)
 	$(call spelling,splitted,split)
 	$(call spelling,Staticly,Statically)
+	$(call spelling,temorary,temporary)
 	$(call spelling,wihout,without)
 	# Force /bin/sh in mkheaders
 	sed -i sX@SHELL@X/bin/shX $(upstream_dir)/fixincludes/mkheaders.in