diff --git a/Android.mk b/Android.mk
index 2638e06..0ea4a42 100644
--- a/Android.mk
+++ b/Android.mk
@@ -2,7 +2,7 @@ LOCAL_PATH:= $(call my-dir)
 include $(CLEAR_VARS)
 
 LOCAL_CFLAGS:= -O3 -DLIBOPENSSL -DLIBIDN -DHAVE_PR29_H -DHAVE_PCRE \
-               -DLIBNCP -DLIBPOSTGRES -DLIBSVN -DLIBSSH -DNO_RINDEX \
+               -DLIBNCP -DLIBPOSTGRES -DLIBSVN -DLIBSSH \
                -DHAVE_MATH_H -DOPENSSL_NO_DEPRECATED -DNO_RSA_LEGACY \
                -fdata-sections -ffunction-sections          
 
diff --git a/configure b/configure
index 90969e4..0287f09 100755
--- a/configure
+++ b/configure
@@ -966,14 +966,6 @@ fi
 
 echo "Checking for Android specialities ..."
 TMPC=comptest$$
-RINDEX=" not"
-echo '#include <stdio.h>' > $TMPC.c
-echo '#include <strings.h>' >> $TMPC.c
-echo "int main() { char *x = rindex(\"test\", 'e'); if (x == NULL) return 0; else return 1; }" >> $TMPC.c
-gcc -o $TMPC $TMPC.c > /dev/null 2>&1
-test -x $TMPC && RINDEX=""
-rm -f $TMPC $TMPC.c
-echo "                                  ... rindex()$RINDEX found"
 if [ -n "$CRYPTO_PATH" ]; then
   RSA=" not"
   echo '#include <stdio.h>' > $TMPC.c
@@ -1060,9 +1052,6 @@ fi
 if [ -n "$SSH_PATH" ]; then
     XDEFINES="$XDEFINES -DLIBSSH"
 fi
-if [ -n "$RINDEX" ]; then
-    XDEFINES="$XDEFINES -DNO_RINDEX"
-fi
 if [ -n "$RSA" ]; then
     XDEFINES="$XDEFINES -DNO_RSA_LEGACY"
 fi
diff --git a/hydra-nntp.c b/hydra-nntp.c
index 890a5a6..15ca9c2 100644
--- a/hydra-nntp.c
+++ b/hydra-nntp.c
@@ -32,11 +32,7 @@ char *nntp_read_server_capacity(int sock) {
           buf[strlen(buf) - 1] = 0;
         if (buf[strlen(buf) - 1] == '\r')
           buf[strlen(buf) - 1] = 0;
-#ifdef NO_RINDEX
         if ((ptr = strrchr(buf, '\n')) != NULL) {
-#else
-        if ((ptr = rindex(buf, '\n')) != NULL) {
-#endif
           ptr++;
           if (isdigit((int) *ptr) && *(ptr + 3) == ' ')
             resp = 1;
diff --git a/hydra-smtp.c b/hydra-smtp.c
index 92ebe61..9302d9e 100644
--- a/hydra-smtp.c
+++ b/hydra-smtp.c
@@ -21,11 +21,7 @@ char *smtp_read_server_capacity(int sock) {
           buf[strlen(buf) - 1] = 0;
         if (buf[strlen(buf) - 1] == '\r')
           buf[strlen(buf) - 1] = 0;
-#ifdef NO_RINDEX
         if ((ptr = strrchr(buf, '\n')) != NULL) {
-#else
-        if ((ptr = rindex(buf, '\n')) != NULL) {
-#endif
           ptr++;
           if (isdigit((int) *ptr) && *(ptr + 3) == ' ')
             resp = 1;