diff --git a/pool-RC.sh b/pool-RC.sh
deleted file mode 100755
index fcc2f02b2..000000000
--- a/pool-RC.sh
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/bin/sh
-#
-# 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.
-# -----------------------------------------------------------------------------
-# Generates a pool RC and publishes (a superset of) maven artifacts to Nexus.
-# Should be run from top-level directory of a fresh checkout of the RC tag.
-#
-# Preconditions:
-# 0) pool-pre-RC has been run to update the download page and release notes
-#    and these have been checked in and included in the RC tag.
-# 1) Release artifacts from previous runs have been svn deleted from local
-#    svn pub/sub dev checkout.
-# 2) Nexus repo from previous RC has been dropped.
-#
-# $Revision$ $Date$
-# -----------------------------------------------------------------------------
-# Set script variables
-version=2.12.0
-repo_path=~/.m2/repository/org/apache/commons/commons-pool2/${version}
-release_path=~/pool  #checkout of https://dist.apache.org/repos/dist/dev/commons/pool
-#
-# Delete any locally installed artifacts from previous runs
-rm -rf ${repo_path}
-echo "Cleaned maven repo."
-#
-# Generate release artifacts, deploy locally and upload to Nexus
-mvn deploy -Prelease -Duser.name=${USERNAME}
-#
-# Copy the zips/tarballs and release notes to the local svn pub path
-cp ${repo_path}/*bin.zip* ${release_path}/binaries
-cp ${repo_path}/*bin.tar.gz* ${release_path}/binaries
-cp ${repo_path}/*src.zip* ${release_path}/source
-cp ${repo_path}/*src.tar.gz* ${release_path}/source
-cp RELEASE-NOTES.txt ${release_path}
-
-echo "Release candidate complete."
-echo "svn add the generated artifacts and commit after inspection."
-echo "log in to repository.apache.org, manually (sic) drop the cruft and close the repo."
-
-
-
diff --git a/src/assembly/src-tar-gz.xml b/src/assembly/src-tar-gz.xml
index b2b9bfcdc..909892a87 100644
--- a/src/assembly/src-tar-gz.xml
+++ b/src/assembly/src-tar-gz.xml
@@ -24,15 +24,12 @@
         <fileSet>
             <includes>
                 <include>build.xml</include>
-                <include>checkstyle.xml</include>
                 <include>LICENSE.txt</include>
-                <include>license-header.txt</include>
                 <include>NOTICE.txt</include>
                 <include>pom.xml</include>
-                <include>README.txt</include>
+                <include>README.md</include>
                 <include>RELEASE-NOTES.txt</include>
-                <include>findbugs-exclude-filter.xml</include>
-                <include>build.properties.sample</include>
+                <include>SECURITY.md</include>
             </includes>
             <lineEnding>lf</lineEnding>
         </fileSet>
@@ -40,6 +37,10 @@
             <directory>doc</directory>
             <lineEnding>lf</lineEnding>
         </fileSet>
+        <fileSet>
+            <directory>src/conf</directory>
+            <lineEnding>lf</lineEnding>
+        </fileSet>
         <fileSet>
             <directory>src/site/resources</directory>
         </fileSet>
diff --git a/src/assembly/src-zip.xml b/src/assembly/src-zip.xml
index 5fafe189c..7819dced6 100644
--- a/src/assembly/src-zip.xml
+++ b/src/assembly/src-zip.xml
@@ -24,15 +24,12 @@
         <fileSet>
             <includes>
                 <include>build.xml</include>
-                <include>checkstyle.xml</include>
                 <include>LICENSE.txt</include>
-                <include>license-header.txt</include>
                 <include>NOTICE.txt</include>
                 <include>pom.xml</include>
-                <include>README.txt</include>
+                <include>README.md</include>
                 <include>RELEASE-NOTES.txt</include>
-                <include>findbugs-exclude-filter.xml</include>
-                <include>build.properties.sample</include>
+                <include>SECURITY.md</include>
             </includes>
             <lineEnding>crlf</lineEnding>
         </fileSet>
@@ -40,6 +37,10 @@
             <directory>doc</directory>
             <lineEnding>crlf</lineEnding>
         </fileSet>
+        <fileSet>
+            <directory>src/conf</directory>
+            <lineEnding>crlf</lineEnding>
+        </fileSet>
         <fileSet>
             <directory>src/site/resources</directory>
         </fileSet>