diff --git a/.travis.yml b/.travis.yml
index 0c50679..edc0b4a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,6 @@
 language: java
 
+# 20-Mar-2019, tatu: While targets JDK 6, build now requires JDK 8
 jdk:
-  - openjdk7
   - openjdk8
+  - openjdk11
diff --git a/README.md b/README.md
index 07b3d33..e78d1c4 100644
--- a/README.md
+++ b/README.md
@@ -18,10 +18,6 @@ Stax2 API is implemented natively by following Stax XML implementations:
 In addition, Stax2 API contains wrapper implementations that can be used to support most of API on
 regular Stax implementations like Sun SJSXP (default Stax implementation bundled with JDK 1.6 and 1.7).
 
-## License
-
-API is licensed under standard BSD license, which is compatible with all Free and Open Software (OSS) licenses.
-
 ## Java package
 
 API classes are in package `org.codehaus.stax2`.
@@ -37,7 +33,13 @@ Maven dependency is defined as:
     <dependency>
       <groupId>org.codehaus.woodstox</groupId>
       <artifactId>stax2-api</artifactId>
-      <version>3.1.4</version>
+      <version>4.2</version>
     </dependency>
 
 Jars can be found from [Central Maven repo](http://repo1.maven.org/maven2/org/codehaus/woodstox/stax2-api/).
+
+## License and Copyright
+
+Copyright (c) 2008 FasterXML LLC <info@fasterxml.com>
+
+This source code is licensed under standard BSD license, which is compatible with all Free and Open Software (OSS) licenses.
diff --git a/pom.xml b/pom.xml
index d838340..c96e0b9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,12 +4,12 @@
   <parent>
       <groupId>com.fasterxml</groupId>
       <artifactId>oss-parent</artifactId>
-      <version>35</version>
+      <version>38</version>
   </parent>
   <groupId>org.codehaus.woodstox</groupId>
   <artifactId>stax2-api</artifactId>
   <name>Stax2 API</name>
-  <version>4.2</version>
+  <version>4.2.1</version>
   <packaging>bundle</packaging>
   <description>tax2 API is an extension to basic Stax 1.0 API that adds significant new functionality, such as full-featured bi-direction validation interface and high-performance Typed Access API.
   </description>
@@ -36,7 +36,7 @@
     <connection>scm:git:git@github.com:FasterXML/stax2-api.git</connection>
     <developerConnection>scm:git:git@github.com:FasterXML/stax2-api.git</developerConnection>
     <url>http://github.com/FasterXML/stax2-api</url>    
-    <tag>stax2-api-4.2</tag>
+    <tag>stax2-api-4.2.1</tag>
   </scm>
 
   <properties>
diff --git a/release-notes/VERSION b/release-notes/VERSION
index c482b6c..f4c400a 100644
--- a/release-notes/VERSION
+++ b/release-notes/VERSION
@@ -4,6 +4,11 @@ Project: Stax2 API
 = Releases
 ------------------------------------------------------------------------
 
+4.2.1 (14-May-2020)
+
+#12: Fix to XML declaration write when `standaloneSet` is specified
+ (suggested by Klaus B)
+
 4.2 (13-Mar-2019)
 
 #15: Add Java 9+ module info using Moditect
diff --git a/src/main/java/org/codehaus/stax2/ri/Stax2EventWriterImpl.java b/src/main/java/org/codehaus/stax2/ri/Stax2EventWriterImpl.java
index 35056c9..3c46c9b 100644
--- a/src/main/java/org/codehaus/stax2/ri/Stax2EventWriterImpl.java
+++ b/src/main/java/org/codehaus/stax2/ri/Stax2EventWriterImpl.java
@@ -83,6 +83,8 @@ public void add(XMLEvent event)
                 StartDocument sd = (StartDocument) event;
                 if (!sd.encodingSet()) { // encoding defined?
                     _writer.writeStartDocument(sd.getVersion());
+                } else if (sd.standaloneSet()) {
+                    _writer.writeStartDocument(sd.getVersion(), sd.getCharacterEncodingScheme(), sd.isStandalone());                    
                 } else {
                     _writer.writeStartDocument(sd.getCharacterEncodingScheme(),
                                                sd.getVersion());
diff --git a/src/main/java/org/codehaus/stax2/ri/typed/StringBase64Decoder.java b/src/main/java/org/codehaus/stax2/ri/typed/StringBase64Decoder.java
index 8db2651..1064645 100644
--- a/src/main/java/org/codehaus/stax2/ri/typed/StringBase64Decoder.java
+++ b/src/main/java/org/codehaus/stax2/ri/typed/StringBase64Decoder.java
@@ -147,7 +147,7 @@ public int decode(byte[] resultBuffer, int resultOffset, int maxLength)
                     // otherwise, our triple is now complete
                     _decodedData = (_decodedData << 6) | bits;
                 }
-                // still along fast path
+                // fall through, still along fast path
 
             case STATE_OUTPUT_3:
                 if (resultOffset >= resultBufferEnd) { // no room