diff --git a/include/report b/include/report
index 0c73d436..2de28e9b 100644
--- a/include/report
+++ b/include/report
@@ -116,10 +116,21 @@
                 echo "  ${WARNING}Warnings${NORMAL} (${TOTAL_WARNINGS}):"
                 echo "  ${WHITE}----------------------------${NORMAL}"
                 for WARNING in ${SWARNINGS}; do
-                    SHOWWARNING=`echo ${WARNING} | sed 's/!space!/ /g' | sed 's/^.* Warning: //' | sed 's/\[details:\(.*\)\] \[solution:\(.*\)\]//' | sed 's/test://'`
-                    ADDLINK=`echo ${WARNING} | sed 's/!space!/ /g' | sed 's/^.* Warning: \(.*\)\[test://' | sed 's/\]\(.*\)]//'`
-                    IS_CUSTOM=`echo ${ADDLINK} | grep "^CUST"`
+                    SOLUTION=""
+                    SHOWWARNING=$(echo ${WARNING} | sed 's/!space!/ /g' | sed 's/^.* Warning: //' | sed 's/\[details:\(.*\)\] \[solution:\(.*\)\]//' | sed 's/test://')
+                    ADDLINK=$(echo ${WARNING} | sed 's/!space!/ /g' | sed 's/^.* Warning: \(.*\)\[test://' | sed 's/\]\(.*\)]//')
+                    DETAILS=$(echo ${SUGGESTION} | sed 's/!space!/ /g' | sed 's/^.* Warning: \(.*\)\[details://' | sed 's/\]\(.*\)]//')
+                    SUGGESTION_PIECES=$(echo ${WARNING} | sed 's/\[/ [/g')
+                    for PIECE in ${SUGGESTION_PIECES}; do
+                        if [ -z "${SOLUTION}" ]; then
+                            SEARCH=$(echo ${PIECE} | grep "^\[solution:")
+                            if [ $? -eq 0 ]; then SOLUTION=$(echo ${SEARCH} | sed 's/!space!/ /g' | sed 's/solution://' | sed 's/text://' | tr -d '[]'); fi
+                        fi
+                    done
+                    IS_CUSTOM=$(echo ${ADDLINK} | grep "^CUST")
                     echo "  ${RED}!${NORMAL} ${SHOWWARNING}"
+                    if [ ! "${DETAILS}" = "-" ]; then echo "    - Details  : ${CYAN}${DETAILS}${NORMAL}"; fi
+                    if [ ${SHOW_REPORT_SOLUTION} -eq 1 -a ! "${SOLUTION}" = "-" ]; then echo "    - Solution : ${SOLUTION}"; fi
                     if [ "${IS_CUSTOM}" = "" ]; then
                         echo "      ${CONTROL_URL_PROTOCOL}://${CONTROL_URL_PREPEND}${ADDLINK}${CONTROL_URL_APPEND}"
                       else