diff --git a/bash_completion b/bash_completion
index 77bd65e3..38241f2d 100644
--- a/bash_completion
+++ b/bash_completion
@@ -884,7 +884,7 @@ _man()
 	fi
 
 	# determine manual section to search
-	[[ "$prev" == [0-9ln] ]] && sect=$prev || sect='*'
+	[[ "$prev" == @([0-9lnp]|[0-9][px]) ]] && sect=$prev || sect='*'
 
 	manpath=$manpath:
 	if [ -n "$cur" ]; then
diff --git a/debian/changelog b/debian/changelog
index 68ce3ea8..476b530e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -60,6 +60,7 @@ bash-completion (200811xx) UNRELEASED; urgency=low
   * Improved performance of rpm -qa based rpm installed package completion
     (Ville Skyttä).
   * Improved features and performance of yum completion (Ville Skyttä).
+  * Added support for p (POSIX) and x (x.org) man sections (Ville Skyttä).
   * Merge from Gentoo:
     - fix 'find' completion so that it properly completes on -?(i)whilename.
       Patch by Ciaran McCreesh.