diff --git a/ChangeLog b/ChangeLog
index c13f11b..3eb7897 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,12 +1,13 @@
 Easy-RSA 3 ChangeLog
 
-3.0.x (TBD)
+3.0.4 (TBD)
     * Remove use of egrep (#154)
     * Integrate with Travis-CI (#165)
     * Remove "local" from variable assignment (#165)
         * Other changes related to Travis-CI fixes
-	* Assign values (even empty ones) to variables defined previously with
-	  "local"
+	* Assign values to variables defined previously w/local
+    * Finally(?) fix the subjectAltName issues I presented earlier (really
+    fixes #168 
 
 3.0.3 (2017-08-22)
     * Include mktemp windows binary
diff --git a/README.md b/README.md
index 97e6c4f..3f25b10 100644
--- a/README.md
+++ b/README.md
@@ -38,7 +38,8 @@ the most recent release.
 The prior 2.x and 1.x versions are available as release branches for
 tracking and possible back-porting of relevant fixes. Branch layout is:
 
-    master <- 3.x, at present
+    master         <- 3.x, at present
+    v3.x.x            pre-release branches, used for staging branches
     release/2.x
     release/1.x
 
diff --git a/easyrsa3/easyrsa b/easyrsa3/easyrsa
index 74084e7..bc0c386 100755
--- a/easyrsa3/easyrsa
+++ b/easyrsa3/easyrsa
@@ -658,7 +658,9 @@ $(display_dn req "$req_in")
 
 		# If type is server and no subjectAltName was requested,
 		# add one to the extensions file
-		if [ "$crt_type" = 'server' ]; then
+		if [ "$crt_type" = 'server' ]; 
+		then
+			sname=$(basename $req_in | cut -d. -f1)
 			echo "$EASYRSA_EXTRA_EXTS" | 
 				grep -q subjectAltName || 
 				default_server_san "$req_in"