-\def\descref#1{\@ifnextchar[{\descref@i{#1}}{\descref@ii{#1}{}}}
-\def\descref@i#1[#2]{\descref@ii{#1}{ #2}}
-\def\descref@ii#1#2#3{%
- \code{#1}#2 (page~%
- {\let\protect\@empty%
- \def\@uscore{-\@gobble}\edef\@tempa{\noexpand\pageref{#3:#1}}\@tempa}%
- )%
+\def\descref{\@ifstar%
+ {\descref@i{}\@gobble{}}%
+ {\descref@i{ (}{\noexpand\autopageref}{)}}}
+\def\descref@i#1#2#3#4#5{\@ifnextchar@preserve[%
+ {\descref@ii{#1}{#2}{#3}{#4}{#5}}%
+ {\descref@iii{#1}{#2}{#3}{#4}{#5}{}}}
+\def\descref@ii#1#2#3#4#5[#6]{\descref@iii{#1}{#2}{#3}{#4}{#5}{ #6}}
+\def\descref@iii#1#2#3#4#5#6{%
+ \begingroup%
+ \let\protect\@empty%
+ \def\@uscore{-\@gobble}%
+ \edef\@tempa##1{%
+ \endgroup%
+ \noexpand\hyperref[#4:#5]%
+ ##1%
+ #2{#4:#5}%
+ }%
+ \@tempa{{\code{#5}}#6#1}#3%