diff --git a/changelog.rst b/changelog.rst
index f35ed3a..07d67db 100644
--- a/changelog.rst
+++ b/changelog.rst
@@ -1,6 +1,13 @@
 Changes
 =======
 
+Since version 0.1.1
+-------------------
+
+- **Name**
+
+  + Allow zero-length name component
+
 Since version 0.1
 -----------------
 
diff --git a/conf.py b/conf.py
index ee871a0..1e55a67 100644
--- a/conf.py
+++ b/conf.py
@@ -48,9 +48,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.1.1'
+version = '0.2'
 # The full version, including alpha/beta/rc tags.
-release = '0.1.1'
+release = '0.2-alpha-1'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/name.rst b/name.rst
index aeb6181..ac88781 100644
--- a/name.rst
+++ b/name.rst
@@ -11,12 +11,12 @@
 We use a 2-level nested TLV to represent a name.
 The Type in the outer TLV indicates this is a Name.
 All inner TLVs have the same Type indicating that they each contain a name component.
-There is no restriction on the Value field in a name component and it may contain any non-empty byte sequence.
+There is no restriction on the Value field in a name component and it may contain any byte sequence.
 
 ::
 
     Name ::= NAME-TYPE TLV-LENGTH NameComponent*
-    NameComponent ::= NAME-COMPONENT-TYPE TLV-LENGTH BYTE+
+    NameComponent ::= NAME-COMPONENT-TYPE TLV-LENGTH BYTE*
 
 
 NDN URI Scheme
@@ -31,7 +31,7 @@
   These are the US-ASCII upper and lower case letters (A-Z, a-z), digits (0-9), and the four specials PLUS (+), PERIOD (.), UNDERSCORE (\_), and HYPHEN (-).
   All other characters are escaped using the percent-encoding method of the URI Generic Syntax.
 
-- To unambiguously represent name components that would collide with the use of . and .. for relative URIs, any component that consists solely of one or more periods is encoded using three additional periods.
+- To unambiguously represent name components that would collide with the use of . and .. for relative URIs, any component that consists solely of zero or more periods is encoded using three additional periods.
 
 - The authority component (the part after the initial ``//`` in the familiar http and ftp URI schemes) is not relevant to NDN.
   It should not be present, and it is ignored if it is present.
@@ -53,7 +53,7 @@
 Canonical Order
 ~~~~~~~~~~~~~~~
 
-In several contexts in NDN packet processing, it is useful to have a consistent ordering of names and name components. NDN names consist of a sequence of NameComponents, and each NameComponent is a sequence of one or more 8-bit bytes. The ordering for components is such that:
+In several contexts in NDN packet processing, it is useful to have a consistent ordering of names and name components. NDN names consist of a sequence of NameComponents, and each NameComponent is a sequence of zero or more 8-bit bytes. The ordering for components is such that:
 
 - If *a* is shorter than *b* (i.e., has fewer bytes), then *a* comes before *b*.