diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index 557a692..61d91fa 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -139,6 +139,8 @@ Logging with Maven 1.x will be removed in a future version of Commons Logging.
 
 * LOGGING-117: Unit tests fail on linux with java16.
 
+* LOGGING-118: Generate source and binary archives.
+
 * MEV-392 (http://jira.codehaus.org/browse/MEV-392)
   As Commons Logging didn't provide a Maven2 pom.xml file, one was helpfully
   created by people not involved with the commons-logging project and published
diff --git a/pom.xml b/pom.xml
index e9f1309..5f03e32 100644
--- a/pom.xml
+++ b/pom.xml
@@ -381,11 +381,11 @@
         <artifactId>maven-assembly-plugin</artifactId>
         <version>2.2-beta-1</version>
         <configuration>
-          <appendAssemblyId>false</appendAssemblyId>
           <!-- Do not deploy the assemblies to the repository. -->
           <attach>false</attach>
           <descriptors>
-            <descriptor>src/assembly/assembly.xml</descriptor>
+            <descriptor>src/assembly/bin.xml</descriptor>
+            <descriptor>src/assembly/src.xml</descriptor>
           </descriptors>
           <tarLongFileMode>gnu</tarLongFileMode>
         </configuration>
diff --git a/src/assembly/assembly.xml b/src/assembly/assembly.xml
deleted file mode 100644
index bf74368..0000000
--- a/src/assembly/assembly.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0"?>
-<!--
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
--->
-
-<assembly>
-  <id></id>
-  <formats>
-    <format>tar.gz</format>
-    <format>zip</format>
-  </formats>
-  <!-- The generated documentation -->
-  <includeSiteDirectory>true</includeSiteDirectory>
-  <fileSets>
-    <fileSet>
-      <includes>
-        <include>build.properties.sample</include>
-        <include>build.xml</include>
-        <include>build-testing.xml</include>
-        <include>checkstyle.xml</include>
-        <include>license-header.txt</include>
-        <include>LICENSE.txt</include>
-        <include>maven.xml</include>
-        <include>NOTICE.txt</include>
-        <include>project.properties</include>
-        <include>project.xml</include>
-        <include>pom.xml</include>
-        <include>RELEASE-NOTES.txt</include>
-        <!-- The source -->
-        <include>src/</include>
-      </includes>
-    </fileSet>
-    <!-- All the jar files -->
-    <fileSet>
-      <directory>target</directory>
-      <outputDirectory></outputDirectory>
-      <includes>
-        <include>*.jar</include>
-      </includes>
-    </fileSet>
-  </fileSets>
-</assembly>
diff --git a/src/assembly/bin.xml b/src/assembly/bin.xml
new file mode 100644
index 0000000..afd46f6
--- /dev/null
+++ b/src/assembly/bin.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<assembly>
+  <id>bin</id>
+  <formats>
+    <format>tar.gz</format>
+    <format>zip</format>
+  </formats>
+  <includeSiteDirectory>true</includeSiteDirectory>
+  <fileSets>
+    <fileSet>
+      <includes>
+        <include>LICENSE*</include>
+        <include>NOTICE*</include>
+        <include>RELEASE-NOTES*</include>
+      </includes>
+    </fileSet>
+    <fileSet>
+      <directory>target</directory>
+      <outputDirectory></outputDirectory>
+      <includes>
+        <include>*.jar</include>
+      </includes>
+    </fileSet>
+  </fileSets>
+</assembly>
\ No newline at end of file
diff --git a/src/assembly/src.xml b/src/assembly/src.xml
new file mode 100644
index 0000000..d789468
--- /dev/null
+++ b/src/assembly/src.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<assembly>
+  <id>src</id>
+  <formats>
+    <format>tar.gz</format>
+    <format>zip</format>
+  </formats>
+  <baseDirectory>${artifactId}-${version}-src</baseDirectory>
+  <fileSets>
+    <fileSet>
+      <directory>.</directory>
+      <outputDirectory></outputDirectory>
+	  <useDefaultExcludes>true</useDefaultExcludes>
+      <excludes>
+        <exclude>**/target/**</exclude>
+      </excludes>
+    </fileSet>
+  </fileSets>
+</assembly>
\ No newline at end of file