[meego-commits] 24159: Changes to Trunk:Testing/mobile-broadband-provider-info

Jussi Kukkonen no_reply at build.meego.com
Wed Sep 28 07:59:42 UTC 2011


Hi,
I have made the following changes to mobile-broadband-provider-info in project Trunk:Testing. Please review and accept ASAP.

Thank You,
Jussi Kukkonen

[This message was auto-generated]

---

Request #24159:

  submit:   home:jku:branches:Trunk/mobile-broadband-provider-info(r8fb06ee042913a1acdec9536ba0ccc4e) -> Trunk:Testing/mobile-broadband-provider-info


Message:
    * Wed Sep 28 2011 Jussi Kukkonen <jku at linux.intel.com> - 20110511
- Latest upstream release (BMC#23453)
- We're upgrading in 1.2.0 so sending here as well...

State:   new          2011-09-28T00:49:21 jku
Comment: None



changes files:
--------------
--- mobile-broadband-provider-info.changes
+++ mobile-broadband-provider-info.changes
@@ -0,0 +1,3 @@
+* Wed Sep 28 2011 Jussi Kukkonen <jku at linux.intel.com> - 20110511
+- Latest upstream release (BMC#23453)
+

old:
----
  mobile-broadband-provider-info-20090918.tar.bz2

new:
----
  mobile-broadband-provider-info-20110511.tar.bz2

spec files:
-----------
--- mobile-broadband-provider-info.spec
+++ mobile-broadband-provider-info.spec
@@ -1,13 +1,13 @@
 # 
-# Do not Edit! Generated by:
-# spectacle version 0.15
+# Do NOT Edit the Auto-generated Part!
+# Generated by: spectacle version 0.22
 # 
 # >> macros
 # << macros
 
 Name:       mobile-broadband-provider-info
 Summary:    Moblie Broadband Dataprovider Database
-Version:    20090918
+Version:    20110511
 Release:    1
 Group:      Applications/Internet
 License:    Creative Commons Public Domain
@@ -16,6 +16,7 @@
 Source100:  mobile-broadband-provider-info.yaml
 Source101:  mobile-broadband-provider-info-rpmlintrc
 
+
 %description
 This package contains mobile broadband settings for different service providers
 in different countries. The Package contains only informational files so it's

other changes:
--------------

++++++ mobile-broadband-provider-info-20090918.tar.bz2 -> mobile-broadband-provider-info-20110511.tar.bz2
--- Makefile.in
+++ Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -111,6 +111,7 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 SET_MAKE = @SET_MAKE@
@@ -280,7 +281,8 @@
 	  fi; \
 	done
 	-test -n "$(am__skip_mode_fix)" \
-	|| find "$(distdir)" -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
+	|| find "$(distdir)" -type d ! -perm -755 \
+		-exec chmod u+rwx,go+rx {} \; -o \
 	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
 	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
 	  ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
@@ -323,17 +325,17 @@
 distcheck: dist
 	case '$(DIST_ARCHIVES)' in \
 	*.tar.gz*) \
-	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
+	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
 	*.tar.bz2*) \
-	  bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
+	  bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
 	*.tar.lzma*) \
-	  unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
+	  lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
 	*.tar.xz*) \
 	  xz -dc $(distdir).tar.xz | $(am__untar) ;;\
 	*.tar.Z*) \
 	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
 	*.shar.gz*) \
-	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
+	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
 	*.zip*) \
 	  unzip $(distdir).zip ;;\
 	esac
--- aclocal.m4
+++ aclocal.m4
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.11 -*- Autoconf -*-
+# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
 # 2005, 2006, 2007, 2008, 2009  Free Software Foundation, Inc.
@@ -13,8 +13,8 @@
 
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.63],,
-[m4_warning([this file was generated for autoconf 2.63.
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],,
+[m4_warning([this file was generated for autoconf 2.68.
 You have another version of autoconf.  It may work, but is not guaranteed to.
 If you have problems, you may need to regenerate the build system entirely.
 To do so, use the procedure documented by the package, typically `autoreconf'.])])
@@ -34,7 +34,7 @@
 [am__api_version='1.11'
 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
 dnl require some minimum version.  Point them to the right macro.
-m4_if([$1], [1.11], [],
+m4_if([$1], [1.11.1], [],
       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
 ])
 
@@ -50,7 +50,7 @@
 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.11])dnl
+[AM_AUTOMAKE_VERSION([1.11.1])dnl
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
--- configure
+++ configure
@@ -1,20 +1,24 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.63 for mobile-broadband-provider-info 20090918.
+# Generated by GNU Autoconf 2.68 for mobile-broadband-provider-info 20110511.
+#
+# Report bugs to <dcbw at redhat.com>.
 #
-# Report bugs to <antti at kaijanmaki.net>.
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
+# Foundation, Inc.
+#
+#
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
-## --------------------- ##
-## M4sh Initialization.  ##
-## --------------------- ##
+## -------------------- ##
+## M4sh Initialization. ##
+## -------------------- ##
 
 # Be more Bourne compatible
 DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
   emulate sh
   NULLCMD=:
   # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
@@ -22,23 +26,15 @@
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
 else
-  case `(set -o) 2>/dev/null` in
-  *posix*) set -o posix ;;
+  case `(set -o) 2>/dev/null` in #(
+  *posix*) :
+    set -o posix ;; #(
+  *) :
+     ;;
 esac
-
 fi
 
 
-
-
-# PATH needs CR
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
 as_nl='
 '
 export as_nl
@@ -46,7 +42,13 @@
 as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
 as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
 as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+# Prefer a ksh shell builtin over an external printf program on Solaris,
+# but without wasting forks for bash or zsh.
+if test -z "$BASH_VERSION$ZSH_VERSION" \
+    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='print -r --'
+  as_echo_n='print -rn --'
+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
   as_echo='printf %s\n'
   as_echo_n='printf %s'
 else
@@ -57,7 +59,7 @@
     as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
     as_echo_n_body='eval
       arg=$1;
-      case $arg in
+      case $arg in #(
       *"$as_nl"*)
 	expr "X$arg" : "X\\(.*\\)$as_nl";
 	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
@@ -80,13 +82,6 @@
   }
 fi
 
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  as_unset=unset
-else
-  as_unset=false
-fi
-
 
 # IFS
 # We need space, tab and new line, in precisely that order.  Quoting is
@@ -96,15 +91,16 @@
 IFS=" ""	$as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
-case $0 in
+as_myself=
+case $0 in #((
   *[\\/]* ) as_myself=$0 ;;
   *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
+    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+  done
 IFS=$as_save_IFS
 
      ;;
@@ -116,12 +112,16 @@
 fi
 if test ! -f "$as_myself"; then
   $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-  { (exit 1); exit 1; }
+  exit 1
 fi
 
-# Work around bugs in pre-3.0 UWIN ksh.
-for as_var in ENV MAIL MAILPATH
-do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+# Unset variables that we do not need and which cause bugs (e.g. in
+# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
+# suppresses any "Segmentation fault" message there.  '((' could
+# trigger a bug in pdksh 5.2.14.
+for as_var in BASH_ENV ENV MAIL MAILPATH
+do eval test x\${$as_var+set} = xset \
+  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
 done
 PS1='$ '
 PS2='> '
@@ -133,330 +133,306 @@
 LANGUAGE=C
 export LANGUAGE
 
-# Required to use basename.
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
-  as_basename=basename
-else
-  as_basename=false
-fi
-
-
-# Name of the executable.
-as_me=`$as_basename -- "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-
 # CDPATH.
-$as_unset CDPATH
-
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
 if test "x$CONFIG_SHELL" = x; then
-  if (eval ":") 2>/dev/null; then
-  as_have_required=yes
+  as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
+  emulate sh
+  NULLCMD=:
+  # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '\${1+\"\$@\"}'='\"\$@\"'
+  setopt NO_GLOB_SUBST
 else
-  as_have_required=no
+  case \`(set -o) 2>/dev/null\` in #(
+  *posix*) :
+    set -o posix ;; #(
+  *) :
+     ;;
+esac
 fi
-
-  if test $as_have_required = yes &&	 (eval ":
-(as_func_return () {
-  (exit \$1)
-}
-as_func_success () {
-  as_func_return 0
-}
-as_func_failure () {
-  as_func_return 1
-}
-as_func_ret_success () {
-  return 0
-}
-as_func_ret_failure () {
-  return 1
-}
+"
+  as_required="as_fn_return () { (exit \$1); }
+as_fn_success () { as_fn_return 0; }
+as_fn_failure () { as_fn_return 1; }
+as_fn_ret_success () { return 0; }
+as_fn_ret_failure () { return 1; }
 
 exitcode=0
-if as_func_success; then
-  :
-else
-  exitcode=1
-  echo as_func_success failed.
-fi
-
-if as_func_failure; then
-  exitcode=1
-  echo as_func_failure succeeded.
-fi
+as_fn_success || { exitcode=1; echo as_fn_success failed.; }
+as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }
+as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }
+as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }
+if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
 
-if as_func_ret_success; then
-  :
 else
-  exitcode=1
-  echo as_func_ret_success failed.
-fi
-
-if as_func_ret_failure; then
-  exitcode=1
-  echo as_func_ret_failure succeeded.
-fi
-
-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
-  :
+  exitcode=1; echo positional parameters were not saved.
+fi
+test x\$exitcode = x0 || exit 1"
+  as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
+  as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
+  eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
+  test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1"
+  if (eval "$as_required") 2>/dev/null; then :
+  as_have_required=yes
 else
-  exitcode=1
-  echo positional parameters were not saved.
+  as_have_required=no
 fi
+  if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
 
-test \$exitcode = 0) || { (exit 1); exit 1; }
-
-(
-  as_lineno_1=\$LINENO
-  as_lineno_2=\$LINENO
-  test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" &&
-  test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; }
-") 2> /dev/null; then
-  :
 else
-  as_candidate_shells=
-    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+as_found=false
 for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  case $as_dir in
+  as_found=:
+  case $as_dir in #(
 	 /*)
 	   for as_base in sh bash ksh sh5; do
-	     as_candidate_shells="$as_candidate_shells $as_dir/$as_base"
+	     # Try only shells that exist, to save several forks.
+	     as_shell=$as_dir/$as_base
+	     if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
+		    { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then :
+  CONFIG_SHELL=$as_shell as_have_required=yes
+		   if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then :
+  break 2
+fi
+fi
 	   done;;
        esac
+  as_found=false
 done
+$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
+	      { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then :
+  CONFIG_SHELL=$SHELL as_have_required=yes
+fi; }
 IFS=$as_save_IFS
 
 
-      for as_shell in $as_candidate_shells $SHELL; do
-	 # Try only shells that exist, to save several forks.
-	 if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
-		{ ("$as_shell") 2> /dev/null <<\_ASEOF
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in
-  *posix*) set -o posix ;;
-esac
-
-fi
-
-
-:
-_ASEOF
-}; then
-  CONFIG_SHELL=$as_shell
-	       as_have_required=yes
-	       if { "$as_shell" 2> /dev/null <<\_ASEOF
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in
-  *posix*) set -o posix ;;
-esac
-
-fi
-
-
-:
-(as_func_return () {
-  (exit $1)
-}
-as_func_success () {
-  as_func_return 0
-}
-as_func_failure () {
-  as_func_return 1
-}
-as_func_ret_success () {
-  return 0
-}
-as_func_ret_failure () {
-  return 1
-}
-
-exitcode=0
-if as_func_success; then
-  :
-else
-  exitcode=1
-  echo as_func_success failed.
-fi
-
-if as_func_failure; then
-  exitcode=1
-  echo as_func_failure succeeded.
-fi
-
-if as_func_ret_success; then
-  :
-else
-  exitcode=1
-  echo as_func_ret_success failed.
-fi
-
-if as_func_ret_failure; then
-  exitcode=1
-  echo as_func_ret_failure succeeded.
+      if test "x$CONFIG_SHELL" != x; then :
+  # We cannot yet assume a decent shell, so we have to provide a
+	# neutralization value for shells without unset; and this also
+	# works around shells that cannot unset nonexistent variables.
+	# Preserve -v and -x to the replacement shell.
+	BASH_ENV=/dev/null
+	ENV=/dev/null
+	(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+	export CONFIG_SHELL
+	case $- in # ((((
+	  *v*x* | *x*v* ) as_opts=-vx ;;
+	  *v* ) as_opts=-v ;;
+	  *x* ) as_opts=-x ;;
+	  * ) as_opts= ;;
+	esac
+	exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
 fi
 
-if ( set x; as_func_ret_success y && test x = "$1" ); then
-  :
-else
-  exitcode=1
-  echo positional parameters were not saved.
+    if test x$as_have_required = xno; then :
+  $as_echo "$0: This script requires a shell more modern than all"
+  $as_echo "$0: the shells that I found on your system."
+  if test x${ZSH_VERSION+set} = xset ; then
+    $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
+    $as_echo "$0: be upgraded to zsh 4.3.4 or later."
+  else
+    $as_echo "$0: Please tell bug-autoconf at gnu.org and dcbw at redhat.com
+$0: about your system, including any error possibly output
+$0: before this message. Then install a modern shell, or
+$0: manually run the script under such a shell if you do
+$0: have one."
+  fi
+  exit 1
 fi
-
-test $exitcode = 0) || { (exit 1); exit 1; }
-
-(
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; }
-
-_ASEOF
-}; then
-  break
 fi
-
 fi
+SHELL=${CONFIG_SHELL-/bin/sh}
+export SHELL
+# Unset more variables known to interfere with behavior of common tools.
+CLICOLOR_FORCE= GREP_OPTIONS=
+unset CLICOLOR_FORCE GREP_OPTIONS
 
-      done
-
-      if test "x$CONFIG_SHELL" != x; then
-  for as_var in BASH_ENV ENV
-	do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-	done
-	export CONFIG_SHELL
-	exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
-fi
+## --------------------- ##
+## M4sh Shell Functions. ##
+## --------------------- ##
+# as_fn_unset VAR
+# ---------------
+# Portably unset VAR.
+as_fn_unset ()
+{
+  { eval $1=; unset $1;}
+}
+as_unset=as_fn_unset
 
+# as_fn_set_status STATUS
+# -----------------------
+# Set $? to STATUS, without forking.
+as_fn_set_status ()
+{
+  return $1
+} # as_fn_set_status
 
-    if test $as_have_required = no; then
-  echo This script requires a shell more modern than all the
-      echo shells that I found on your system.  Please install a
-      echo modern shell, or manually run the script under such a
-      echo shell if you do have one.
-      { (exit 1); exit 1; }
-fi
+# as_fn_exit STATUS
+# -----------------
+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
+as_fn_exit ()
+{
+  set +e
+  as_fn_set_status $1
+  exit $1
+} # as_fn_exit
+
+# as_fn_mkdir_p
+# -------------
+# Create "$as_dir" as a directory, including parents if necessary.
+as_fn_mkdir_p ()
+{
 
+  case $as_dir in #(
+  -*) as_dir=./$as_dir;;
+  esac
+  test -d "$as_dir" || eval $as_mkdir_p || {
+    as_dirs=
+    while :; do
+      case $as_dir in #(
+      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+      *) as_qdir=$as_dir;;
+      esac
+      as_dirs="'$as_qdir' $as_dirs"
+      as_dir=`$as_dirname -- "$as_dir" ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$as_dir" : 'X\(//\)[^/]' \| \
+	 X"$as_dir" : 'X\(//\)$' \| \
+	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_dir" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+      test -d "$as_dir" && break
+    done
+    test -z "$as_dirs" || eval "mkdir $as_dirs"
+  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
 
-fi
 
-fi
+} # as_fn_mkdir_p
+# as_fn_append VAR VALUE
+# ----------------------
+# Append the text in VALUE to the end of the definition contained in VAR. Take
+# advantage of any shell optimizations that allow amortized linear growth over
+# repeated appends, instead of the typical quadratic growth present in naive
+# implementations.
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
+  eval 'as_fn_append ()
+  {
+    eval $1+=\$2
+  }'
+else
+  as_fn_append ()
+  {
+    eval $1=\$$1\$2
+  }
+fi # as_fn_append
 
+# as_fn_arith ARG...
+# ------------------
+# Perform arithmetic evaluation on the ARGs, and store the result in the
+# global $as_val. Take advantage of shells that can avoid forks. The arguments
+# must be portable across $(()) and expr.
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
+  eval 'as_fn_arith ()
+  {
+    as_val=$(( $* ))
+  }'
+else
+  as_fn_arith ()
+  {
+    as_val=`expr "$@" || test $? -eq 1`
+  }
+fi # as_fn_arith
 
 
-(eval "as_func_return () {
-  (exit \$1)
-}
-as_func_success () {
-  as_func_return 0
-}
-as_func_failure () {
-  as_func_return 1
-}
-as_func_ret_success () {
-  return 0
-}
-as_func_ret_failure () {
-  return 1
-}
+# as_fn_error STATUS ERROR [LINENO LOG_FD]
+# ----------------------------------------
+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
+# script with STATUS, using 1 if that was 0.
+as_fn_error ()
+{
+  as_status=$1; test $as_status -eq 0 && as_status=1
+  if test "$4"; then
+    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+  fi
+  $as_echo "$as_me: error: $2" >&2
+  as_fn_exit $as_status
+} # as_fn_error
 
-exitcode=0
-if as_func_success; then
-  :
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
+  as_expr=expr
 else
-  exitcode=1
-  echo as_func_success failed.
-fi
-
-if as_func_failure; then
-  exitcode=1
-  echo as_func_failure succeeded.
+  as_expr=false
 fi
 
-if as_func_ret_success; then
-  :
+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
+  as_basename=basename
 else
-  exitcode=1
-  echo as_func_ret_success failed.
-fi
-
-if as_func_ret_failure; then
-  exitcode=1
-  echo as_func_ret_failure succeeded.
+  as_basename=false
 fi
 
-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
-  :
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+  as_dirname=dirname
 else
-  exitcode=1
-  echo positional parameters were not saved.
+  as_dirname=false
 fi
 
-test \$exitcode = 0") || {
-  echo No shell found that supports shell functions.
-  echo Please tell bug-autoconf at gnu.org about your system,
-  echo including any error possibly output before this message.
-  echo This can help us improve future autoconf versions.
-  echo Configuration will now proceed without shell functions.
-}
+as_me=`$as_basename -- "$0" ||
+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+	 X"$0" : 'X\(//\)$' \| \
+	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X/"$0" |
+    sed '/^.*\/\([^/][^/]*\)\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
 
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
 
 
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
-
-  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
-  # uniformly replaced by the line number.  The first 'sed' inserts a
-  # line-number line after each line using $LINENO; the second 'sed'
-  # does the real work.  The second script uses 'N' to pair each
-  # line-number line with the line containing $LINENO, and appends
-  # trailing '-' during substitution so that $LINENO is not a special
-  # case at line end.
-  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-  # scripts with optimization help from Paolo Bonzini.  Blame Lee
-  # E. McMahon (1931-1989) for sed's syntax.  :-)
+  as_lineno_1=$LINENO as_lineno_1a=$LINENO
+  as_lineno_2=$LINENO as_lineno_2a=$LINENO
+  eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" &&
+  test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || {
+  # Blame Lee E. McMahon (1931-1989) for sed's syntax.  :-)
   sed -n '
     p
     /[$]LINENO/=
@@ -473,8 +449,7 @@
       s/-\n.*//
     ' >$as_me.lineno &&
   chmod +x "$as_me.lineno" ||
-    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
-   { (exit 1); exit 1; }; }
+    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
 
   # Don't try to exec as it changes $[0], causing all sort of problems
   # (the dirname of $[0] is not the place where we might find the
@@ -484,29 +459,18 @@
   exit
 }
 
-
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-  as_dirname=dirname
-else
-  as_dirname=false
-fi
-
 ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in
+case `echo -n x` in #(((((
 -n*)
-  case `echo 'x\c'` in
+  case `echo 'xy\c'` in
   *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-  *)   ECHO_C='\c';;
+  xy)  ECHO_C='\c';;
+  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
+       ECHO_T='	';;
   esac;;
 *)
   ECHO_N='-n';;
 esac
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-  as_expr=expr
-else
-  as_expr=false
-fi
 
 rm -f conf$$ conf$$.exe conf$$.file
 if test -d conf$$.dir; then
@@ -536,7 +500,7 @@
 rmdir conf$$.dir 2>/dev/null
 
 if mkdir -p . 2>/dev/null; then
-  as_mkdir_p=:
+  as_mkdir_p='mkdir -p "$as_dir"'
 else
   test -d ./-p && rmdir ./-p
   as_mkdir_p=false
@@ -555,10 +519,10 @@
       if test -d "$1"; then
 	test -d "$1/.";
       else
-	case $1 in
+	case $1 in #(
 	-*)set "./$1";;
 	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
+	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
 	???[sx]*):;;*)false;;esac;fi
     '\'' sh
   '
@@ -572,11 +536,11 @@
 as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
 
 
-
-exec 7<&0 </dev/null 6>&1
+test -n "$DJDIR" || exec 7<&0 </dev/null
+exec 6>&1
 
 # Name of the host.
-# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
+# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,
 # so uname gets run too.
 ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
 
@@ -591,14 +555,14 @@
 subdirs=
 MFLAGS=
 MAKEFLAGS=
-SHELL=${CONFIG_SHELL-/bin/sh}
 
 # Identity of this package.
 PACKAGE_NAME='mobile-broadband-provider-info'
 PACKAGE_TARNAME='mobile-broadband-provider-info'
-PACKAGE_VERSION='20090918'
-PACKAGE_STRING='mobile-broadband-provider-info 20090918'
-PACKAGE_BUGREPORT='antti at kaijanmaki.net'
+PACKAGE_VERSION='20110511'
+PACKAGE_STRING='mobile-broadband-provider-info 20110511'
+PACKAGE_BUGREPORT='dcbw at redhat.com'
+PACKAGE_URL=''
 
 ac_subst_vars='LTLIBOBJS
 LIBOBJS
@@ -658,6 +622,7 @@
 program_transform_name
 prefix
 exec_prefix
+PACKAGE_URL
 PACKAGE_BUGREPORT
 PACKAGE_STRING
 PACKAGE_VERSION
@@ -735,8 +700,9 @@
   fi
 
   case $ac_option in
-  *=*)	ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
-  *)	ac_optarg=yes ;;
+  *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
+  *=)   ac_optarg= ;;
+  *)    ac_optarg=yes ;;
   esac
 
   # Accept the important Cygnus configure options, so we can diagnose typos.
@@ -781,8 +747,7 @@
     ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
-   { (exit 1); exit 1; }; }
+      as_fn_error $? "invalid feature name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
@@ -808,8 +773,7 @@
     ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
-   { (exit 1); exit 1; }; }
+      as_fn_error $? "invalid feature name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
@@ -1013,8 +977,7 @@
     ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
-   { (exit 1); exit 1; }; }
+      as_fn_error $? "invalid package name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
@@ -1030,8 +993,7 @@
     ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
-   { (exit 1); exit 1; }; }
+      as_fn_error $? "invalid package name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
@@ -1061,17 +1023,17 @@
   | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
     x_libraries=$ac_optarg ;;
 
-  -*) { $as_echo "$as_me: error: unrecognized option: $ac_option
-Try \`$0 --help' for more information." >&2
-   { (exit 1); exit 1; }; }
+  -*) as_fn_error $? "unrecognized option: \`$ac_option'
+Try \`$0 --help' for more information"
     ;;
 
   *=*)
     ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
-      { $as_echo "$as_me: error: invalid variable name: $ac_envvar" >&2
-   { (exit 1); exit 1; }; }
+    case $ac_envvar in #(
+      '' | [0-9]* | *[!_$as_cr_alnum]* )
+      as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
+    esac
     eval $ac_envvar=\$ac_optarg
     export $ac_envvar ;;
 
@@ -1080,7 +1042,7 @@
     $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
     expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
       $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
-    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
+    : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
     ;;
 
   esac
@@ -1088,15 +1050,13 @@
 
 if test -n "$ac_prev"; then
   ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-  { $as_echo "$as_me: error: missing argument to $ac_option" >&2
-   { (exit 1); exit 1; }; }
+  as_fn_error $? "missing argument to $ac_option"
 fi
 
 if test -n "$ac_unrecognized_opts"; then
   case $enable_option_checking in
     no) ;;
-    fatal) { $as_echo "$as_me: error: unrecognized options: $ac_unrecognized_opts" >&2
-   { (exit 1); exit 1; }; } ;;
+    fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
     *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
   esac
 fi
@@ -1119,8 +1079,7 @@
     [\\/$]* | ?:[\\/]* )  continue;;
     NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
   esac
-  { $as_echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
-   { (exit 1); exit 1; }; }
+  as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
 done
 
 # There might be people who depend on the old broken behavior: `$host'
@@ -1134,8 +1093,8 @@
 if test "x$host_alias" != x; then
   if test "x$build_alias" = x; then
     cross_compiling=maybe
-    $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
-    If a cross compiler is detected then cross compile mode will be used." >&2
+    $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
+    If a cross compiler is detected then cross compile mode will be used" >&2
   elif test "x$build_alias" != "x$host_alias"; then
     cross_compiling=yes
   fi
@@ -1150,11 +1109,9 @@
 ac_pwd=`pwd` && test -n "$ac_pwd" &&
 ac_ls_di=`ls -di .` &&
 ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
-  { $as_echo "$as_me: error: working directory cannot be determined" >&2
-   { (exit 1); exit 1; }; }
+  as_fn_error $? "working directory cannot be determined"
 test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
-  { $as_echo "$as_me: error: pwd does not report name of working directory" >&2
-   { (exit 1); exit 1; }; }
+  as_fn_error $? "pwd does not report name of working directory"
 
 
 # Find the source files, if location was not specified.
@@ -1193,13 +1150,11 @@
 fi
 if test ! -r "$srcdir/$ac_unique_file"; then
   test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
-  { $as_echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
-   { (exit 1); exit 1; }; }
+  as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
 fi
 ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
 ac_abs_confdir=`(
-	cd "$srcdir" && test -r "./$ac_unique_file" || { $as_echo "$as_me: error: $ac_msg" >&2
-   { (exit 1); exit 1; }; }
+	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
 	pwd)`
 # When building in place, set srcdir=.
 if test "$ac_abs_confdir" = "$ac_pwd"; then
@@ -1225,7 +1180,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures mobile-broadband-provider-info 20090918 to adapt to many kinds of systems.
+\`configure' configures mobile-broadband-provider-info 20110511 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1239,7 +1194,7 @@
       --help=short        display options specific to this package
       --help=recursive    display the short help of all the included packages
   -V, --version           display version information and exit
-  -q, --quiet, --silent   do not print \`checking...' messages
+  -q, --quiet, --silent   do not print \`checking ...' messages
       --cache-file=FILE   cache test results in FILE [disabled]
   -C, --config-cache      alias for \`--cache-file=config.cache'
   -n, --no-create         do not create output files
@@ -1292,7 +1247,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of mobile-broadband-provider-info 20090918:";;
+     short | recursive ) echo "Configuration of mobile-broadband-provider-info 20110511:";;
    esac
   cat <<\_ACEOF
 
@@ -1303,7 +1258,7 @@
   --enable-maintainer-mode  enable make rules and dependencies not useful
 			  (and sometimes confusing) to the casual installer
 
-Report bugs to <antti at kaijanmaki.net>.
+Report bugs to <dcbw at redhat.com>.
 _ACEOF
 ac_status=$?
 fi
@@ -1366,22 +1321,25 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-mobile-broadband-provider-info configure 20090918
-generated by GNU Autoconf 2.63
+mobile-broadband-provider-info configure 20110511
+generated by GNU Autoconf 2.68
 
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright (C) 2010 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 _ACEOF
   exit
 fi
+
+## ------------------------ ##
+## Autoconf initialization. ##
+## ------------------------ ##
 cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by mobile-broadband-provider-info $as_me 20090918, which was
-generated by GNU Autoconf 2.63.  Invocation command line was
+It was created by mobile-broadband-provider-info $as_me 20110511, which was
+generated by GNU Autoconf 2.68.  Invocation command line was
 
   $ $0 $@
 
@@ -1417,8 +1375,8 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  $as_echo "PATH: $as_dir"
-done
+    $as_echo "PATH: $as_dir"
+  done
 IFS=$as_save_IFS
 
 } >&5
@@ -1455,9 +1413,9 @@
       ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
     esac
     case $ac_pass in
-    1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
+    1) as_fn_append ac_configure_args0 " '$ac_arg'" ;;
     2)
-      ac_configure_args1="$ac_configure_args1 '$ac_arg'"
+      as_fn_append ac_configure_args1 " '$ac_arg'"
       if test $ac_must_keep_next = true; then
 	ac_must_keep_next=false # Got value, back to normal.
       else
@@ -1473,13 +1431,13 @@
 	  -* ) ac_must_keep_next=true ;;
 	esac
       fi
-      ac_configure_args="$ac_configure_args '$ac_arg'"
+      as_fn_append ac_configure_args " '$ac_arg'"
       ;;
     esac
   done
 done
-$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; }
-$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; }
+{ ac_configure_args0=; unset ac_configure_args0;}
+{ ac_configure_args1=; unset ac_configure_args1;}
 
 # When interrupted or exit'd, cleanup temporary files, and complete
 # config.log.  We remove comments because anyway the quotes in there
@@ -1491,11 +1449,9 @@
   {
     echo
 
-    cat <<\_ASBOX
-## ---------------- ##
+    $as_echo "## ---------------- ##
 ## Cache variables. ##
-## ---------------- ##
-_ASBOX
+## ---------------- ##"
     echo
     # The following way of writing the cache mishandles newlines in values,
 (
@@ -1504,13 +1460,13 @@
     case $ac_val in #(
     *${as_nl}*)
       case $ac_var in #(
-      *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
+      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
 $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
       esac
       case $ac_var in #(
       _ | IFS | as_nl) ;; #(
       BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
-      *) $as_unset $ac_var ;;
+      *) { eval $ac_var=; unset $ac_var;} ;;
       esac ;;
     esac
   done
@@ -1529,11 +1485,9 @@
 )
     echo
 
-    cat <<\_ASBOX
-## ----------------- ##
+    $as_echo "## ----------------- ##
 ## Output variables. ##
-## ----------------- ##
-_ASBOX
+## ----------------- ##"
     echo
     for ac_var in $ac_subst_vars
     do
@@ -1546,11 +1500,9 @@
     echo
 
     if test -n "$ac_subst_files"; then
-      cat <<\_ASBOX
-## ------------------- ##
+      $as_echo "## ------------------- ##
 ## File substitutions. ##
-## ------------------- ##
-_ASBOX
+## ------------------- ##"
       echo
       for ac_var in $ac_subst_files
       do
@@ -1564,11 +1516,9 @@
     fi
 
     if test -s confdefs.h; then
-      cat <<\_ASBOX
-## ----------- ##
+      $as_echo "## ----------- ##
 ## confdefs.h. ##
-## ----------- ##
-_ASBOX
+## ----------- ##"
       echo
       cat confdefs.h
       echo
@@ -1582,46 +1532,53 @@
     exit $exit_status
 ' 0
 for ac_signal in 1 2 13 15; do
-  trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
+  trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal
 done
 ac_signal=0
 
 # confdefs.h avoids OS command line length limits that DEFS can exceed.
 rm -f -r conftest* confdefs.h
 
+$as_echo "/* confdefs.h */" > confdefs.h
+
 # Predefined preprocessor variables.
 
 cat >>confdefs.h <<_ACEOF
 #define PACKAGE_NAME "$PACKAGE_NAME"
 _ACEOF
 
-
 cat >>confdefs.h <<_ACEOF
 #define PACKAGE_TARNAME "$PACKAGE_TARNAME"
 _ACEOF
 
-
 cat >>confdefs.h <<_ACEOF
 #define PACKAGE_VERSION "$PACKAGE_VERSION"
 _ACEOF
 
-
 cat >>confdefs.h <<_ACEOF
 #define PACKAGE_STRING "$PACKAGE_STRING"
 _ACEOF
 
-
 cat >>confdefs.h <<_ACEOF
 #define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
 _ACEOF
 
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_URL "$PACKAGE_URL"
+_ACEOF
+
 
 # Let the site file select an alternate cache file if it wants to.
 # Prefer an explicitly selected file to automatically selected ones.
 ac_site_file1=NONE
 ac_site_file2=NONE
 if test -n "$CONFIG_SITE"; then
-  ac_site_file1=$CONFIG_SITE
+  # We do not want a PATH search for config.site.
+  case $CONFIG_SITE in #((
+    -*)  ac_site_file1=./$CONFIG_SITE;;
+    */*) ac_site_file1=$CONFIG_SITE;;
+    *)   ac_site_file1=./$CONFIG_SITE;;
+  esac
 elif test "x$prefix" != xNONE; then
   ac_site_file1=$prefix/share/config.site
   ac_site_file2=$prefix/etc/config.site
@@ -1632,19 +1589,23 @@
 for ac_site_file in "$ac_site_file1" "$ac_site_file2"
 do
   test "x$ac_site_file" = xNONE && continue
-  if test -r "$ac_site_file"; then
-    { $as_echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
+  if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
 $as_echo "$as_me: loading site script $ac_site_file" >&6;}
     sed 's/^/| /' "$ac_site_file" >&5
-    . "$ac_site_file"
+    . "$ac_site_file" \
+      || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "failed to load site script $ac_site_file
+See \`config.log' for more details" "$LINENO" 5; }
   fi
 done
 
 if test -r "$cache_file"; then
-  # Some versions of bash will fail to source /dev/null (special
-  # files actually), so we avoid doing that.
-  if test -f "$cache_file"; then
-    { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5
+  # Some versions of bash will fail to source /dev/null (special files
+  # actually), so we avoid doing that.  DJGPP emulates it as a regular file.
+  if test /dev/null != "$cache_file" && test -f "$cache_file"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
 $as_echo "$as_me: loading cache $cache_file" >&6;}
     case $cache_file in
       [\\/]* | ?:[\\/]* ) . "$cache_file";;
@@ -1652,7 +1613,7 @@
     esac
   fi
 else
-  { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
 $as_echo "$as_me: creating cache $cache_file" >&6;}
   >$cache_file
 fi
@@ -1667,11 +1628,11 @@
   eval ac_new_val=\$ac_env_${ac_var}_value
   case $ac_old_set,$ac_new_set in
     set,)
-      { $as_echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
 $as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,set)
-      { $as_echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
+      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5
 $as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,);;
@@ -1681,17 +1642,17 @@
 	ac_old_val_w=`echo x $ac_old_val`
 	ac_new_val_w=`echo x $ac_new_val`
 	if test "$ac_old_val_w" != "$ac_new_val_w"; then
-	  { $as_echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
+	  { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5
 $as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
 	  ac_cache_corrupted=:
 	else
-	  { $as_echo "$as_me:$LINENO: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
+	  { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
 $as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
 	  eval $ac_var=\$ac_old_val
 	fi
-	{ $as_echo "$as_me:$LINENO:   former value:  \`$ac_old_val'" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}:   former value:  \`$ac_old_val'" >&5
 $as_echo "$as_me:   former value:  \`$ac_old_val'" >&2;}
-	{ $as_echo "$as_me:$LINENO:   current value: \`$ac_new_val'" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}:   current value: \`$ac_new_val'" >&5
 $as_echo "$as_me:   current value: \`$ac_new_val'" >&2;}
       fi;;
   esac
@@ -1703,43 +1664,20 @@
     esac
     case " $ac_configure_args " in
       *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
-      *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;
+      *) as_fn_append ac_configure_args " '$ac_arg'" ;;
     esac
   fi
 done
 if $ac_cache_corrupted; then
-  { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-  { $as_echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
 $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  { { $as_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
-$as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
 fi
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+## -------------------- ##
+## Main body of script. ##
+## -------------------- ##
 
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -1767,9 +1705,7 @@
   fi
 done
 if test -z "$ac_aux_dir"; then
-  { { $as_echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5
-$as_echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
 fi
 
 # These three variables are undocumented and unsupported,
@@ -1795,10 +1731,10 @@
 # OS/2's system install, which has a completely different semantic
 # ./install, which can be erroneously created by make from ./install.sh.
 # Reject install programs that cannot install multiple files.
-{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
 $as_echo_n "checking for a BSD-compatible install... " >&6; }
 if test -z "$INSTALL"; then
-if test "${ac_cv_path_install+set}" = set; then
+if ${ac_cv_path_install+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -1806,11 +1742,11 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  # Account for people who put trailing slashes in PATH elements.
-case $as_dir/ in
-  ./ | .// | /cC/* | \
+    # Account for people who put trailing slashes in PATH elements.
+case $as_dir/ in #((
+  ./ | .// | /[cC]/* | \
   /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
-  ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
+  ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \
   /usr/ucb/* ) ;;
   *)
     # OSF1 and SCO ODT 3.0 have their own names for install.
@@ -1847,7 +1783,7 @@
     ;;
 esac
 
-done
+  done
 IFS=$as_save_IFS
 
 rm -rf conftest.one conftest.two conftest.dir
@@ -1863,7 +1799,7 @@
     INSTALL=$ac_install_sh
   fi
 fi
-{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5
 $as_echo "$INSTALL" >&6; }
 
 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
@@ -1874,7 +1810,7 @@
 
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
-{ $as_echo "$as_me:$LINENO: checking whether build environment is sane" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
 $as_echo_n "checking whether build environment is sane... " >&6; }
 # Just in case
 sleep 1
@@ -1885,15 +1821,11 @@
 '
 case `pwd` in
   *[\\\"\#\$\&\'\`$am_lf]*)
-    { { $as_echo "$as_me:$LINENO: error: unsafe absolute working directory name" >&5
-$as_echo "$as_me: error: unsafe absolute working directory name" >&2;}
-   { (exit 1); exit 1; }; };;
+    as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;;
 esac
 case $srcdir in
   *[\\\"\#\$\&\'\`$am_lf\ \	]*)
-    { { $as_echo "$as_me:$LINENO: error: unsafe srcdir value: \`$srcdir'" >&5
-$as_echo "$as_me: error: unsafe srcdir value: \`$srcdir'" >&2;}
-   { (exit 1); exit 1; }; };;
+    as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
 esac
 
 # Do `set' in a subshell so we don't clobber the current shell's
@@ -1915,11 +1847,8 @@
       # if, for instance, CONFIG_SHELL is bash and it inherits a
       # broken ls alias from the environment.  This has actually
       # happened.  Such a system could not be considered "sane".
-      { { $as_echo "$as_me:$LINENO: error: ls -t appears to fail.  Make sure there is not a broken
-alias in your environment" >&5
-$as_echo "$as_me: error: ls -t appears to fail.  Make sure there is not a broken
-alias in your environment" >&2;}
-   { (exit 1); exit 1; }; }
+      as_fn_error $? "ls -t appears to fail.  Make sure there is not a broken
+alias in your environment" "$LINENO" 5
    fi
 
    test "$2" = conftest.file
@@ -1928,13 +1857,10 @@
    # Ok.
    :
 else
-   { { $as_echo "$as_me:$LINENO: error: newly created file is older than distributed files!
-Check your system clock" >&5
-$as_echo "$as_me: error: newly created file is older than distributed files!
-Check your system clock" >&2;}
-   { (exit 1); exit 1; }; }
+   as_fn_error $? "newly created file is older than distributed files!
+Check your system clock" "$LINENO" 5
 fi
-{ $as_echo "$as_me:$LINENO: result: yes" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 test "$program_prefix" != NONE &&
   program_transform_name="s&^&$program_prefix&;$program_transform_name"
@@ -1962,7 +1888,7 @@
   am_missing_run="$MISSING --run "
 else
   am_missing_run=
-  { $as_echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5
 $as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
 fi
 
@@ -1983,9 +1909,9 @@
   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
 set dummy ${ac_tool_prefix}strip; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_STRIP+set}" = set; then
+if ${ac_cv_prog_STRIP+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$STRIP"; then
@@ -1996,24 +1922,24 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 STRIP=$ac_cv_prog_STRIP
 if test -n "$STRIP"; then
-  { $as_echo "$as_me:$LINENO: result: $STRIP" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
 $as_echo "$STRIP" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -2023,9 +1949,9 @@
   ac_ct_STRIP=$STRIP
   # Extract the first word of "strip", so it can be a program name with args.
 set dummy strip; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
+if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_STRIP"; then
@@ -2036,24 +1962,24 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_STRIP="strip"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
 if test -n "$ac_ct_STRIP"; then
-  { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
 $as_echo "$ac_ct_STRIP" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -2062,7 +1988,7 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
@@ -2075,10 +2001,10 @@
 fi
 INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
 
-{ $as_echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5
 $as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
 if test -z "$MKDIR_P"; then
-  if test "${ac_cv_path_mkdir+set}" = set; then
+  if ${ac_cv_path_mkdir+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -2086,7 +2012,7 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_prog in mkdir gmkdir; do
+    for ac_prog in mkdir gmkdir; do
 	 for ac_exec_ext in '' $ac_executable_extensions; do
 	   { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
 	   case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
@@ -2098,11 +2024,12 @@
 	   esac
 	 done
        done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 
+  test -d ./--version && rmdir ./--version
   if test "${ac_cv_path_mkdir+set}" = set; then
     MKDIR_P="$ac_cv_path_mkdir -p"
   else
@@ -2110,11 +2037,10 @@
     # value for MKDIR_P within a source directory, because that will
     # break other packages using the cache if that directory is
     # removed, or if the value is a relative name.
-    test -d ./--version && rmdir ./--version
     MKDIR_P="$ac_install_sh -d"
   fi
 fi
-{ $as_echo "$as_me:$LINENO: result: $MKDIR_P" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
 $as_echo "$MKDIR_P" >&6; }
 
 mkdir_p="$MKDIR_P"
@@ -2127,9 +2053,9 @@
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_AWK+set}" = set; then
+if ${ac_cv_prog_AWK+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$AWK"; then
@@ -2140,24 +2066,24 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_AWK="$ac_prog"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 AWK=$ac_cv_prog_AWK
 if test -n "$AWK"; then
-  { $as_echo "$as_me:$LINENO: result: $AWK" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
 $as_echo "$AWK" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -2165,11 +2091,11 @@
   test -n "$AWK" && break
 done
 
-{ $as_echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
 $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
 set x ${MAKE-make}
 ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
-if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
+if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.make <<\_ACEOF
@@ -2177,7 +2103,7 @@
 all:
 	@echo '@@@%%%=$(MAKE)=@@@%%%'
 _ACEOF
-# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
+# GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
 case `${MAKE-make} -f conftest.make 2>/dev/null` in
   *@@@%%%=?*=@@@%%%*)
     eval ac_cv_prog_make_${ac_make}_set=yes;;
@@ -2187,11 +2113,11 @@
 rm -f conftest.make
 fi
 if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
-  { $as_echo "$as_me:$LINENO: result: yes" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
   SET_MAKE=
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
   SET_MAKE="MAKE=${MAKE-make}"
 fi
@@ -2211,9 +2137,7 @@
   am__isrc=' -I$(srcdir)'
   # test to see if srcdir already configured
   if test -f $srcdir/config.status; then
-    { { $as_echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
-$as_echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
   fi
 fi
 
@@ -2229,7 +2153,7 @@
 
 # Define the identity of the package.
  PACKAGE='mobile-broadband-provider-info'
- VERSION='20090918'
+ VERSION='20110511'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -2270,16 +2194,16 @@
 
 
 
-{ $as_echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
 $as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
     # Check whether --enable-maintainer-mode was given.
-if test "${enable_maintainer_mode+set}" = set; then
+if test "${enable_maintainer_mode+set}" = set; then :
   enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval
 else
   USE_MAINTAINER_MODE=no
 fi
 
-  { $as_echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_MAINTAINER_MODE" >&5
 $as_echo "$USE_MAINTAINER_MODE" >&6; }
    if test $USE_MAINTAINER_MODE = yes; then
   MAINTAINER_MODE_TRUE=
@@ -2322,13 +2246,13 @@
     case $ac_val in #(
     *${as_nl}*)
       case $ac_var in #(
-      *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
+      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
 $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
       esac
       case $ac_var in #(
       _ | IFS | as_nl) ;; #(
       BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
-      *) $as_unset $ac_var ;;
+      *) { eval $ac_var=; unset $ac_var;} ;;
       esac ;;
     esac
   done
@@ -2336,8 +2260,8 @@
   (set) 2>&1 |
     case $as_nl`(ac_space=' '; set) 2>&1` in #(
     *${as_nl}ac_space=\ *)
-      # `set' does not quote correctly, so add quotes (double-quote
-      # substitution turns \\\\ into \\, and sed turns \\ into \).
+      # `set' does not quote correctly, so add quotes: double-quote
+      # substitution turns \\\\ into \\, and sed turns \\ into \.
       sed -n \
 	"s/'/'\\\\''/g;
 	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
@@ -2359,12 +2283,23 @@
      :end' >>confcache
 if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
   if test -w "$cache_file"; then
-    test "x$cache_file" != "x/dev/null" &&
-      { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5
+    if test "x$cache_file" != "x/dev/null"; then
+      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
 $as_echo "$as_me: updating cache $cache_file" >&6;}
-    cat confcache >$cache_file
+      if test ! -f "$cache_file" || test -h "$cache_file"; then
+	cat confcache >"$cache_file"
+      else
+        case $cache_file in #(
+        */* | ?:*)
+	  mv -f confcache "$cache_file"$$ &&
+	  mv -f "$cache_file"$$ "$cache_file" ;; #(
+        *)
+	  mv -f confcache "$cache_file" ;;
+	esac
+      fi
+    fi
   else
-    { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
 $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
   fi
 fi
@@ -2414,14 +2349,15 @@
 
 ac_libobjs=
 ac_ltlibobjs=
+U=
 for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
   # 1. Remove the extension, and $U if already installed.
   ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
   ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
   # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
   #    will be set to the directory where LIBOBJS objects are built.
-  ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
-  ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo'
+  as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"
+  as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo'
 done
 LIBOBJS=$ac_libobjs
 
@@ -2430,20 +2366,18 @@
 
 
 if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 
-: ${CONFIG_STATUS=./config.status}
+: "${CONFIG_STATUS=./config.status}"
 ac_write_fail=0
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ $as_echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
 $as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
-cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+as_write_fail=0
+cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1
 #! $SHELL
 # Generated by $as_me.
 # Run this file to recreate the current configuration.
@@ -2453,17 +2387,18 @@
 debug=false
 ac_cs_recheck=false
 ac_cs_silent=false
-SHELL=\${CONFIG_SHELL-$SHELL}
-_ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-## --------------------- ##
-## M4sh Initialization.  ##
-## --------------------- ##
+SHELL=\${CONFIG_SHELL-$SHELL}
+export SHELL
+_ASEOF
+cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1
+## -------------------- ##
+## M4sh Initialization. ##
+## -------------------- ##
 
 # Be more Bourne compatible
 DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
   emulate sh
   NULLCMD=:
   # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
@@ -2471,23 +2406,15 @@
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
 else
-  case `(set -o) 2>/dev/null` in
-  *posix*) set -o posix ;;
+  case `(set -o) 2>/dev/null` in #(
+  *posix*) :
+    set -o posix ;; #(
+  *) :
+     ;;
 esac
-
 fi
 
 
-
-
-# PATH needs CR
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
 as_nl='
 '
 export as_nl
@@ -2495,7 +2422,13 @@
 as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
 as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
 as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+# Prefer a ksh shell builtin over an external printf program on Solaris,
+# but without wasting forks for bash or zsh.
+if test -z "$BASH_VERSION$ZSH_VERSION" \
+    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='print -r --'
+  as_echo_n='print -rn --'
+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
   as_echo='printf %s\n'
   as_echo_n='printf %s'
 else
@@ -2506,7 +2439,7 @@
     as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
     as_echo_n_body='eval
       arg=$1;
-      case $arg in
+      case $arg in #(
       *"$as_nl"*)
 	expr "X$arg" : "X\\(.*\\)$as_nl";
 	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
@@ -2529,13 +2462,6 @@
   }
 fi
 
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  as_unset=unset
-else
-  as_unset=false
-fi
-
 
 # IFS
 # We need space, tab and new line, in precisely that order.  Quoting is
@@ -2545,15 +2471,16 @@
 IFS=" ""	$as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
-case $0 in
+as_myself=
+case $0 in #((
   *[\\/]* ) as_myself=$0 ;;
   *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
+    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+  done
 IFS=$as_save_IFS
 
      ;;
@@ -2565,12 +2492,16 @@
 fi
 if test ! -f "$as_myself"; then
   $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-  { (exit 1); exit 1; }
+  exit 1
 fi
 
-# Work around bugs in pre-3.0 UWIN ksh.
-for as_var in ENV MAIL MAILPATH
-do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+# Unset variables that we do not need and which cause bugs (e.g. in
+# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
+# suppresses any "Segmentation fault" message there.  '((' could
+# trigger a bug in pdksh 5.2.14.
+for as_var in BASH_ENV ENV MAIL MAILPATH
+do eval test x\${$as_var+set} = xset \
+  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
 done
 PS1='$ '
 PS2='> '
@@ -2582,7 +2513,89 @@
 LANGUAGE=C
 export LANGUAGE
 
-# Required to use basename.
+# CDPATH.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+
+# as_fn_error STATUS ERROR [LINENO LOG_FD]
+# ----------------------------------------
+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
+# script with STATUS, using 1 if that was 0.
+as_fn_error ()
+{
+  as_status=$1; test $as_status -eq 0 && as_status=1
+  if test "$4"; then
+    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+  fi
+  $as_echo "$as_me: error: $2" >&2
+  as_fn_exit $as_status
+} # as_fn_error
+
+
+# as_fn_set_status STATUS
+# -----------------------
+# Set $? to STATUS, without forking.
+as_fn_set_status ()
+{
+  return $1
+} # as_fn_set_status
+
+# as_fn_exit STATUS
+# -----------------
+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
+as_fn_exit ()
+{
+  set +e
+  as_fn_set_status $1
+  exit $1
+} # as_fn_exit
+
+# as_fn_unset VAR
+# ---------------
+# Portably unset VAR.
+as_fn_unset ()
+{
+  { eval $1=; unset $1;}
+}
+as_unset=as_fn_unset
+# as_fn_append VAR VALUE
+# ----------------------
+# Append the text in VALUE to the end of the definition contained in VAR. Take
+# advantage of any shell optimizations that allow amortized linear growth over
+# repeated appends, instead of the typical quadratic growth present in naive
+# implementations.
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
+  eval 'as_fn_append ()
+  {
+    eval $1+=\$2
+  }'
+else
+  as_fn_append ()
+  {
+    eval $1=\$$1\$2
+  }
+fi # as_fn_append
+
+# as_fn_arith ARG...
+# ------------------
+# Perform arithmetic evaluation on the ARGs, and store the result in the
+# global $as_val. Take advantage of shells that can avoid forks. The arguments
+# must be portable across $(()) and expr.
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
+  eval 'as_fn_arith ()
+  {
+    as_val=$(( $* ))
+  }'
+else
+  as_fn_arith ()
+  {
+    as_val=`expr "$@" || test $? -eq 1`
+  }
+fi # as_fn_arith
+
+
 if expr a : '\(a\)' >/dev/null 2>&1 &&
    test "X`expr 00001 : '.*\(...\)'`" = X001; then
   as_expr=expr
@@ -2596,8 +2609,12 @@
   as_basename=false
 fi
 
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+  as_dirname=dirname
+else
+  as_dirname=false
+fi
 
-# Name of the executable.
 as_me=`$as_basename -- "$0" ||
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$0" : 'X\(//\)$' \| \
@@ -2617,76 +2634,25 @@
 	  }
 	  s/.*/./; q'`
 
-# CDPATH.
-$as_unset CDPATH
-
-
-
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
-
-  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
-  # uniformly replaced by the line number.  The first 'sed' inserts a
-  # line-number line after each line using $LINENO; the second 'sed'
-  # does the real work.  The second script uses 'N' to pair each
-  # line-number line with the line containing $LINENO, and appends
-  # trailing '-' during substitution so that $LINENO is not a special
-  # case at line end.
-  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-  # scripts with optimization help from Paolo Bonzini.  Blame Lee
-  # E. McMahon (1931-1989) for sed's syntax.  :-)
-  sed -n '
-    p
-    /[$]LINENO/=
-  ' <$as_myself |
-    sed '
-      s/[$]LINENO.*/&-/
-      t lineno
-      b
-      :lineno
-      N
-      :loop
-      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
-      t loop
-      s/-\n.*//
-    ' >$as_me.lineno &&
-  chmod +x "$as_me.lineno" ||
-    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
-   { (exit 1); exit 1; }; }
-
-  # Don't try to exec as it changes $[0], causing all sort of problems
-  # (the dirname of $[0] is not the place where we might find the
-  # original and so on.  Autoconf is especially sensitive to this).
-  . "./$as_me.lineno"
-  # Exit status is that of the last command.
-  exit
-}
-
-
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-  as_dirname=dirname
-else
-  as_dirname=false
-fi
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
 
 ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in
+case `echo -n x` in #(((((
 -n*)
-  case `echo 'x\c'` in
+  case `echo 'xy\c'` in
   *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-  *)   ECHO_C='\c';;
+  xy)  ECHO_C='\c';;
+  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
+       ECHO_T='	';;
   esac;;
 *)
   ECHO_N='-n';;
 esac
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-  as_expr=expr
-else
-  as_expr=false
-fi
 
 rm -f conf$$ conf$$.exe conf$$.file
 if test -d conf$$.dir; then
@@ -2715,8 +2681,56 @@
 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
 rmdir conf$$.dir 2>/dev/null
 
+
+# as_fn_mkdir_p
+# -------------
+# Create "$as_dir" as a directory, including parents if necessary.
+as_fn_mkdir_p ()
+{
+
+  case $as_dir in #(
+  -*) as_dir=./$as_dir;;
+  esac
+  test -d "$as_dir" || eval $as_mkdir_p || {
+    as_dirs=
+    while :; do
+      case $as_dir in #(
+      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+      *) as_qdir=$as_dir;;
+      esac
+      as_dirs="'$as_qdir' $as_dirs"
+      as_dir=`$as_dirname -- "$as_dir" ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$as_dir" : 'X\(//\)[^/]' \| \
+	 X"$as_dir" : 'X\(//\)$' \| \
+	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_dir" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+      test -d "$as_dir" && break
+    done
+    test -z "$as_dirs" || eval "mkdir $as_dirs"
+  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
+
+
+} # as_fn_mkdir_p
 if mkdir -p . 2>/dev/null; then
-  as_mkdir_p=:
+  as_mkdir_p='mkdir -p "$as_dir"'
 else
   test -d ./-p && rmdir ./-p
   as_mkdir_p=false
@@ -2735,10 +2749,10 @@
       if test -d "$1"; then
 	test -d "$1/.";
       else
-	case $1 in
+	case $1 in #(
 	-*)set "./$1";;
 	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
+	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
 	???[sx]*):;;*)false;;esac;fi
     '\'' sh
   '
@@ -2753,13 +2767,19 @@
 
 
 exec 6>&1
+## ----------------------------------- ##
+## Main body of $CONFIG_STATUS script. ##
+## ----------------------------------- ##
+_ASEOF
+test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1
 
-# Save the log message, to keep $[0] and so on meaningful, and to
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# Save the log message, to keep $0 and so on meaningful, and to
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by mobile-broadband-provider-info $as_me 20090918, which was
-generated by GNU Autoconf 2.63.  Invocation command line was
+This file was extended by mobile-broadband-provider-info $as_me 20110511, which was
+generated by GNU Autoconf 2.68.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -2786,13 +2806,15 @@
 
 cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 ac_cs_usage="\
-\`$as_me' instantiates files from templates according to the
-current configuration.
+\`$as_me' instantiates files and other configuration actions
+from templates according to the current configuration.  Unless the files
+and actions are specified as TAGs, all are instantiated by default.
 
-Usage: $0 [OPTION]... [FILE]...
+Usage: $0 [OPTION]... [TAG]...
 
   -h, --help       print this help, then exit
   -V, --version    print version number and configuration settings, then exit
+      --config     print configuration, then exit
   -q, --quiet, --silent
                    do not print progress messages
   -d, --debug      don't remove temporary files
@@ -2803,16 +2825,17 @@
 Configuration files:
 $config_files
 
-Report bugs to <bug-autoconf at gnu.org>."
+Report bugs to <dcbw at redhat.com>."
 
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-mobile-broadband-provider-info config.status 20090918
-configured by $0, generated by GNU Autoconf 2.63,
-  with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
+mobile-broadband-provider-info config.status 20110511
+configured by $0, generated by GNU Autoconf 2.68,
+  with options \\"\$ac_cs_config\\"
 
-Copyright (C) 2008 Free Software Foundation, Inc.
+Copyright (C) 2010 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
@@ -2830,11 +2853,16 @@
 while test $# != 0
 do
   case $1 in
-  --*=*)
+  --*=?*)
     ac_option=`expr "X$1" : 'X\([^=]*\)='`
     ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
     ac_shift=:
     ;;
+  --*=)
+    ac_option=`expr "X$1" : 'X\([^=]*\)='`
+    ac_optarg=
+    ac_shift=:
+    ;;
   *)
     ac_option=$1
     ac_optarg=$2
@@ -2848,14 +2876,17 @@
     ac_cs_recheck=: ;;
   --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
     $as_echo "$ac_cs_version"; exit ;;
+  --config | --confi | --conf | --con | --co | --c )
+    $as_echo "$ac_cs_config"; exit ;;
   --debug | --debu | --deb | --de | --d | -d )
     debug=: ;;
   --file | --fil | --fi | --f )
     $ac_shift
     case $ac_optarg in
     *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    '') as_fn_error $? "missing file argument" ;;
     esac
-    CONFIG_FILES="$CONFIG_FILES '$ac_optarg'"
+    as_fn_append CONFIG_FILES " '$ac_optarg'"
     ac_need_defaults=false;;
   --he | --h |  --help | --hel | -h )
     $as_echo "$ac_cs_usage"; exit ;;
@@ -2864,11 +2895,10 @@
     ac_cs_silent=: ;;
 
   # This is an error.
-  -*) { $as_echo "$as_me: error: unrecognized option: $1
-Try \`$0 --help' for more information." >&2
-   { (exit 1); exit 1; }; } ;;
+  -*) as_fn_error $? "unrecognized option: \`$1'
+Try \`$0 --help' for more information." ;;
 
-  *) ac_config_targets="$ac_config_targets $1"
+  *) as_fn_append ac_config_targets " $1"
      ac_need_defaults=false ;;
 
   esac
@@ -2917,9 +2947,7 @@
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
     "mobile-broadband-provider-info.pc") CONFIG_FILES="$CONFIG_FILES mobile-broadband-provider-info.pc" ;;
 
-  *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
-$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
-   { (exit 1); exit 1; }; };;
+  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
   esac
 done
 
@@ -2940,26 +2968,24 @@
 # after its creation but before its name has been assigned to `$tmp'.
 $debug ||
 {
-  tmp=
+  tmp= ac_tmp=
   trap 'exit_status=$?
-  { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
+  : "${ac_tmp:=$tmp}"
+  { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status
 ' 0
-  trap '{ (exit 1); exit 1; }' 1 2 13 15
+  trap 'as_fn_exit 1' 1 2 13 15
 }
 # Create a (secure) tmp directory for tmp files.
 
 {
   tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
-  test -n "$tmp" && test -d "$tmp"
+  test -d "$tmp"
 }  ||
 {
   tmp=./conf$$-$RANDOM
   (umask 077 && mkdir "$tmp")
-} ||
-{
-   $as_echo "$as_me: cannot create a temporary directory in ." >&2
-   { (exit 1); exit 1; }
-}
+} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
+ac_tmp=$tmp
 
 # Set up the scripts for CONFIG_FILES section.
 # No need to generate them if there are no CONFIG_FILES.
@@ -2967,7 +2993,13 @@
 if test -n "$CONFIG_FILES"; then
 
 
-ac_cr='
'
+ac_cr=`echo X | tr X '\015'`
+# On cygwin, bash can eat \r inside `` if the user requested igncr.
+# But we know of no other shell where ac_cr would be empty at this
+# point, so we can use a bashism as a fallback.
+if test "x$ac_cr" = x; then
+  eval ac_cr=\$\'\\r\'
+fi
 ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
 if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
   ac_cs_awk_cr='\\r'
@@ -2975,7 +3007,7 @@
   ac_cs_awk_cr=$ac_cr
 fi
 
-echo 'BEGIN {' >"$tmp/subs1.awk" &&
+echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
 _ACEOF
 
 
@@ -2984,24 +3016,18 @@
   echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
   echo "_ACEOF"
 } >conf$$subs.sh ||
-  { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
-   { (exit 1); exit 1; }; }
-ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
+  as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   . ./conf$$subs.sh ||
-    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
 
   ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
   if test $ac_delim_n = $ac_delim_num; then
     break
   elif $ac_last_try; then
-    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
   else
     ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
   fi
@@ -3009,7 +3035,7 @@
 rm -f conf$$subs.sh
 
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
+cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&
 _ACEOF
 sed -n '
 h
@@ -3023,7 +3049,7 @@
 t delim
 :nl
 h
-s/\(.\{148\}\).*/\1/
+s/\(.\{148\}\)..*/\1/
 t more1
 s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
 p
@@ -3037,7 +3063,7 @@
 t nl
 :delim
 h
-s/\(.\{148\}\).*/\1/
+s/\(.\{148\}\)..*/\1/
 t more2
 s/["\\]/\\&/g; s/^/"/; s/$/"/
 p
@@ -3057,7 +3083,7 @@
 rm -f conf$$subs.awk
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 _ACAWK
-cat >>"\$tmp/subs1.awk" <<_ACAWK &&
+cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
   for (key in S) S_is_set[key] = 1
   FS = ""
 
@@ -3089,23 +3115,29 @@
   sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
 else
   cat
-fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
-  || { { $as_echo "$as_me:$LINENO: error: could not setup config files machinery" >&5
-$as_echo "$as_me: error: could not setup config files machinery" >&2;}
-   { (exit 1); exit 1; }; }
+fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \
+  || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
 _ACEOF
 
-# VPATH may cause trouble with some makes, so we remove $(srcdir),
-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
+# VPATH may cause trouble with some makes, so we remove sole $(srcdir),
+# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
 # trailing colons and then remove the whole line if VPATH becomes empty
 # (actually we leave an empty line to preserve line numbers).
 if test "x$srcdir" = x.; then
-  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
-s/:*\$(srcdir):*/:/
-s/:*\${srcdir}:*/:/
-s/:*@srcdir@:*/:/
-s/^\([^=]*=[	 ]*\):*/\1/
+  ac_vpsub='/^[	 ]*VPATH[	 ]*=[	 ]*/{
+h
+s///
+s/^/:/
+s/[	 ]*$/:/
+s/:\$(srcdir):/:/g
+s/:\${srcdir}:/:/g
+s/:@srcdir@:/:/g
+s/^:*//
 s/:*$//
+x
+s/\(=[	 ]*\).*/\1/
+G
+s/\n//
 s/^[^=]*=[	 ]*$//
 }'
 fi
@@ -3123,9 +3155,7 @@
   esac
   case $ac_mode$ac_tag in
   :[FHL]*:*);;
-  :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: invalid tag $ac_tag" >&5
-$as_echo "$as_me: error: invalid tag $ac_tag" >&2;}
-   { (exit 1); exit 1; }; };;
+  :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
   :[FH]-) ac_tag=-:-;;
   :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
   esac
@@ -3144,7 +3174,7 @@
     for ac_f
     do
       case $ac_f in
-      -) ac_f="$tmp/stdin";;
+      -) ac_f="$ac_tmp/stdin";;
       *) # Look for the file first in the build tree, then in the source tree
 	 # (if the path is not absolute).  The absolute path cannot be DOS-style,
 	 # because $ac_f cannot contain `:'.
@@ -3153,12 +3183,10 @@
 	   [\\/$]*) false;;
 	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
 	   esac ||
-	   { { $as_echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
-$as_echo "$as_me: error: cannot find input file: $ac_f" >&2;}
-   { (exit 1); exit 1; }; };;
+	   as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
       esac
       case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
-      ac_file_inputs="$ac_file_inputs '$ac_f'"
+      as_fn_append ac_file_inputs " '$ac_f'"
     done
 
     # Let's still pretend it is `configure' which instantiates (i.e., don't
@@ -3169,7 +3197,7 @@
 	`' by configure.'
     if test x"$ac_file" != x-; then
       configure_input="$ac_file.  $configure_input"
-      { $as_echo "$as_me:$LINENO: creating $ac_file" >&5
+      { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
 $as_echo "$as_me: creating $ac_file" >&6;}
     fi
     # Neutralize special characters interpreted by sed in replacement strings.
@@ -3181,10 +3209,8 @@
     esac
 
     case $ac_tag in
-    *:-:* | *:-) cat >"$tmp/stdin" \
-      || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
-   { (exit 1); exit 1; }; } ;;
+    *:-:* | *:-) cat >"$ac_tmp/stdin" \
+      || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
     esac
     ;;
   esac
@@ -3212,47 +3238,7 @@
 	    q
 	  }
 	  s/.*/./; q'`
-  { as_dir="$ac_dir"
-  case $as_dir in #(
-  -*) as_dir=./$as_dir;;
-  esac
-  test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
-    as_dirs=
-    while :; do
-      case $as_dir in #(
-      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
-      *) as_qdir=$as_dir;;
-      esac
-      as_dirs="'$as_qdir' $as_dirs"
-      as_dir=`$as_dirname -- "$as_dir" ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-      test -d "$as_dir" && break
-    done
-    test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
-   { (exit 1); exit 1; }; }; }
+  as_dir="$ac_dir"; as_fn_mkdir_p
   ac_builddir=.
 
 case "$ac_dir" in
@@ -3309,7 +3295,6 @@
 # If the template does not know about datarootdir, expand it.
 # FIXME: This hack should be removed a few years after 2.60.
 ac_datarootdir_hack=; ac_datarootdir_seen=
-
 ac_sed_dataroot='
 /datarootdir/ {
   p
@@ -3319,12 +3304,11 @@
 /@docdir@/p
 /@infodir@/p
 /@localedir@/p
-/@mandir@/p
-'
+/@mandir@/p'
 case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
 *datarootdir*) ac_datarootdir_seen=yes;;
 *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
-  { $as_echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
 $as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
@@ -3334,7 +3318,7 @@
   s&@infodir@&$infodir&g
   s&@localedir@&$localedir&g
   s&@mandir@&$mandir&g
-    s&\\\${datarootdir}&$datarootdir&g' ;;
+  s&\\\${datarootdir}&$datarootdir&g' ;;
 esac
 _ACEOF
 
@@ -3362,27 +3346,24 @@
 s&@MKDIR_P@&$ac_MKDIR_P&;t t
 $ac_datarootdir_hack
 "
-eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
-  || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
-   { (exit 1); exit 1; }; }
+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \
+  >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5
 
 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
-  { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
-  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
-  { $as_echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined.  Please make sure it is defined." >&5
+  { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
+  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' \
+      "$ac_tmp/out"`; test -z "$ac_out"; } &&
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+which seems to be undefined.  Please make sure it is defined" >&5
 $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined.  Please make sure it is defined." >&2;}
+which seems to be undefined.  Please make sure it is defined" >&2;}
 
-  rm -f "$tmp/stdin"
+  rm -f "$ac_tmp/stdin"
   case $ac_file in
-  -) cat "$tmp/out" && rm -f "$tmp/out";;
-  *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
+  -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";;
+  *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";;
   esac \
-  || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
-   { (exit 1); exit 1; }; }
+  || as_fn_error $? "could not create $ac_file" "$LINENO" 5
  ;;
 
 
@@ -3392,15 +3373,12 @@
 done # for ac_tag
 
 
-{ (exit 0); exit 0; }
+as_fn_exit 0
 _ACEOF
-chmod +x $CONFIG_STATUS
 ac_clean_files=$ac_clean_files_save
 
 test $ac_write_fail = 0 ||
-  { { $as_echo "$as_me:$LINENO: error: write failure creating $CONFIG_STATUS" >&5
-$as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
 
 
 # configure is writing to config.log, and then calls config.status.
@@ -3421,10 +3399,10 @@
   exec 5>>config.log
   # Use ||, not &&, to avoid exiting from the if with $? = 1, which
   # would make configure fail if this is the last instruction.
-  $ac_cs_success || { (exit 1); exit 1; }
+  $ac_cs_success || as_fn_exit 1
 fi
 if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
-  { $as_echo "$as_me:$LINENO: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
 $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
 fi
 
--- configure.ac
+++ configure.ac
@@ -1,6 +1,6 @@
 AC_PREREQ(2.52)
 
-AC_INIT(mobile-broadband-provider-info, 20090918, antti at kaijanmaki.net, mobile-broadband-provider-info)
+AC_INIT(mobile-broadband-provider-info, 20110511, dcbw at redhat.com, mobile-broadband-provider-info)
 AM_INIT_AUTOMAKE([-Wall -Werror foreign no-dist-gzip dist-bzip2])
 AM_MAINTAINER_MODE
 
--- mobile-broadband-provider-info.pc.in
+++ mobile-broadband-provider-info.pc.in
@@ -10,4 +10,4 @@
 Description: Mobile Broadband Service Provider Information Database
 Requires:
 Version: @VERSION@
-Cflags: -DMOBILE_BROADBAND_PROVIDER_INFO='\"${database}\"'
+
--- serviceproviders.2.dtd
+++ serviceproviders.2.dtd
@@ -6,7 +6,7 @@
 
 <!ELEMENT provider (name+, gsm?, cdma?)>
 
-<!ELEMENT gsm (network-id*, apn+)>
+<!ELEMENT gsm (network-id*, voicemail*, balance-check*, balance-top-up*, apn*)>
 <!ELEMENT apn (name*,
                gateway?,
                username?,
@@ -14,14 +14,72 @@
                dns*)>
 <!ATTLIST apn value CDATA #REQUIRED>
 
+<!ELEMENT voicemail (#PCDATA)>
+<!-- contains dial string used to access voicemail services for this provider -->
+<!-- for historical/legacy reasons network providers may support various alternative -->
+<!-- dial strings that can be used to access voicemail services -->
+
+<!ELEMENT balance-check (ussd*,
+                         dtmf*,
+                         sms*,
+                         ussd-response*)>
+<!-- for handset branding and historical/legacy reasons, network providers often -->
+<!-- support a number of alternative methods to check balance/allowance. -->
+<!-- the first element will typically be the default method -->
+
+<!ELEMENT ussd (#PCDATA)>
+<!ATTLIST ussd replacement CDATA #IMPLIED>
+<!-- contains * prefixed string which when sent to the network should result in
+     a response text string from network. The attribute "replacement" is a
+     string that, if found in the #PCDATA, can be replaced by user input, e.g.
+     to provide a pin code for balance top up.
+  -->
+
+<!ELEMENT dtmf (#PCDATA)>
+<!-- contains dial string used to access balance check service via voice call -->
+
+<!ELEMENT sms (#PCDATA)>
+<!ATTLIST sms text CDATA #REQUIRED>
+<!-- contains dial string and text string used to access balance check service via sms -->
+
+<!ELEMENT ussd-response (#PCDATA)>
+<!-- similar to standard ussd method but requires user to select options from initial network response -->
+<!-- typically, option 1 followed by option 3 will display remaining credit -->
+<!-- this method does not have widespread use -->
+
+<!ELEMENT balance-top-up (ussd*,
+                          sms*)>
+<!-- Howto top up the balance of prepaid cards -->
+
 <!ELEMENT network-id EMPTY>
 <!ATTLIST network-id mcc CDATA #REQUIRED>
 <!ATTLIST network-id mnc CDATA #REQUIRED>
+<!-- network-id should contain all the providers's known MCC/MNC codes.
+     The MCC should be a three-digit ITU E.212 Mobile Country Code (like
+     '310' or '409') and the MNC should be a two- or three-digit GSM
+     Mobile Network Code.  Even if the provider is an MVNO, it's upstream
+     network infrastructure provider's MCC/MNC codes should be included
+     so that the MCC+MNC from the IMSI of the MVNO's SIM can be roughly
+     matched to the provider.
+-->
+
+<!ELEMENT username (#PCDATA)>
+<!-- username required for authentication when starting a packet data session -->
 
-<!ELEMENT username (#PCDATA)> 
 <!ELEMENT password (#PCDATA)>
+<!-- password required for authentication when starting a packet data session -->
+
 <!ELEMENT dns (#PCDATA)>
+<!-- Any static IPv4 DNS servers required for the provider; usually these are
+     sent to the client automatically via PPP or PDP context negotiation and
+     this value is not used.
+-->
+
 <!ELEMENT gateway (#PCDATA)>
+<!-- Static IPv4 gateway to which IP traffic for the data session should be
+     directed to.  Usually the gateway is provided automatically via PPP or
+     PDP context negotiation and this value is not used.
+-->
 
 <!ELEMENT cdma (name*,
                 username?,
@@ -31,6 +89,7 @@
 
 <!ELEMENT sid EMPTY>
 <!ATTLIST sid value CDATA #REQUIRED>
+<!-- AMPS/CDMA System IDs known to be used by this provider -->
 
 <!ELEMENT name (#PCDATA)>
 <!ATTLIST name xml:lang CDATA #IMPLIED>
--- serviceproviders.xml
+++ serviceproviders.xml
@@ -58,6 +58,27 @@
 			</apn>
 		</gsm>
 	</provider>
+	<provider>
+		<name>du</name>
+		<gsm>
+			<network-id mcc="424" mnc="03"/>
+			<apn value="du"/>
+		</gsm>
+	</provider>
+</country>
+
+<!-- Afghanistan -->
+<country code="af">
+	<provider>
+		<name>AWCC</name>
+		<gsm>
+			<network-id mcc="412" mnc="01"/>
+			<apn value="internet">
+				<username>awcc</username>
+				<password>1111</password>
+			</apn>
+		</gsm>
+	</provider>
 </country>
 
 <!-- Albania -->
@@ -66,11 +87,55 @@
 		<name>Vodafone</name>
 		<gsm>
 			<network-id mcc="276" mnc="02"/>
-			<apn value="Twa" />
+			<apn value="Twa">
+				<name>TWA</name>
+			</apn>
+			<apn value="vodafoneweb">
+				<name>Vodafone Web</name>
+			</apn>
+		</gsm>
+	</provider>
+</country>
+
+<!-- Armenia -->
+<country code="am">
+	<provider>
+		<name>Beeline</name>
+		<gsm>
+			<network-id mcc="283" mnc="01"/>
+			<apn value="internet.beeline.am">
+				<username>internet</username>
+				<password>internet</password>
+			</apn>
+		</gsm>
+	</provider>
+	<provider>
+		<name>Orange</name>
+		<gsm>
+			<network-id mcc="283" mnc="10"/>
+			<apn value="internet.orange">
+				<name>Internet Hima (USB)</name>
+			</apn>
+			<apn value="internet">
+				<name>Mobile Broadband</name>
+			</apn>
+		</gsm>
+	</provider>
+	<provider>
+		<name>VivaCell/MTS</name>
+		<gsm>
+			<network-id mcc="283" mnc="05"/>
+			<apn value="connect.vivacell.am">
+				<name>MTS connect</name>
+			</apn>
+			<apn value="inet.vivacell.am">
+				<name>Mobile Broadband</name>
+			</apn>
 		</gsm>
 	</provider>
 </country>
 
+
 <!-- Angola -->
 <country code="ao">
 	<provider>
@@ -103,17 +168,33 @@
 		</gsm>
 	</provider>
 	<provider>
+		<name>Arnet</name>
+		<gsm>
+			<network-id mcc="722" mnc="340"/>
+			<apn value="arnet.personal.com">
+				<dns>172.25.7.6</dns>
+				<dns>172.25.7.7</dns>
+			</apn>
+		</gsm>
+	</provider>
+	<provider>
 		<name>Claro</name>
 		<gsm>
 			<network-id mcc="722" mnc="310"/>
 			<network-id mcc="722" mnc="320"/>
 			<network-id mcc="722" mnc="330"/>
-			<apn value="igprs.claro.com.ar">
+			<apn value="gprs.claro.com.ar">
+				<name>3G Internet</name>
 				<username>clarogprs</username>
 				<password>clarogprs999</password>
 				<dns>170.51.255.100</dns>
 				<dns>170.51.242.18</dns>
 			</apn>
+			<apn value="internet.ctimovil.com.ar">
+				<name>GPRS</name>
+				<username>clarogprs</username>
+				<password>clarogprs999</password>
+			</apn>
 		</gsm>
 	</provider>
 	<provider>
@@ -132,55 +213,69 @@
 <!-- Austria -->
 <country code="at">
 	<provider>
-		<name>Max</name>
+		<name>A1/Telekom Austria</name>
 		<gsm>
-			<apn value="gprsinternet">
-				<name>Max Online</name>
-				<username>GPRS</username>
-				<dns>213.162.64.1</dns>
-				<dns>213.162.64.2</dns>
+			<!-- Vodafone Broadband Connect version 10.1.0.23908 2010-06-07T17:47:01 -->
+			<network-id mcc="232" mnc="01"/>
+			<apn value="a1.net">
+				<name>A1 Breitband</name>
+				<username>ppp at a1plus.at</username>
+				<password>ppp</password>
 			</apn>
-			<apn value="business.gprsinternet">
-				<name>Max Online (Business)</name>
-				<username>GPRS</username>
-				<dns>213.162.64.1</dns>
-				<dns>213.162.64.2</dns>
+			<!-- https://www.aon.at/export/sites/default/residential/pdf/produktfolder/aonFlex_Mobiltelefon.pdf-->
+			<apn value="aon.data">
+				<name>aon (Flex, Breitband-Duo, BusinessFlex)</name>
+				<username>mobile at aon.at</username>
+				<password>ppp</password>
 			</apn>
-			<apn value="gprsmetro">
-				<name>Max Online (Metro)</name>
-				<username>GPRS</username>
-				<dns>213.162.64.1</dns>
-				<dns>213.162.64.2</dns>
+			<!-- http://konfigurator.aon.at/otauseraon/templates/user/aon/manuals/AON_Installation.pdf -->
+			<apn value="aon.at">
+				<name>aonMobile</name>
+				<username>mobile at aon.at</username>
+				<password>ppp</password>
 			</apn>
 		</gsm>
 	</provider>
 	<provider>
-		<name>Mobilkom/A1</name>
+		<name>Bob</name>
 		<gsm>
-			<network-id mcc="232" mnc="01"/>
-			<apn value="a1.net">
-				<username>ppp at a1plus.at</username>
+			<network-id mcc="232" mnc="11"/>
+			<apn value="bob.at">
+				<username>data at bob.at</username>
 				<password>ppp</password>
-				<dns>194.48.139.254</dns>
-				<dns>194.48.124.202</dns>
 			</apn>
 		</gsm>
 	</provider>
 	<provider>
 		<name>T-Mobile</name>
 		<gsm>
-			<network-id mcc="232" mnc="07"/>
 			<network-id mcc="232" mnc="03"/>
+			<apn value="gprswap">
+				<name>WAP</name>
+				<username>t-mobile</username>
+				<password>tm</password>
+			</apn>
 			<apn value="gprsinternet">
+				<name>Internet</name>
+				<username>t-mobile</username>
+				<password>tm</password>
+			</apn>
+			<apn value="business.gprsinternet">
+				<name>Business Internet</name>
 				<username>t-mobile</username>
 				<password>tm</password>
 			</apn>
+		</gsm>
+	</provider>
+	<provider>
+		<name>tele.ring</name>
+		<gsm>
+			<network-id mcc="232" mnc="07"/>
 			<apn value="web">
-				<name>T-Mobile (formerly tele.ring)</name>
 				<username>web at telering.at</username>
 				<password>web</password>
-				<dns>212.95.31.167</dns>
-				<dns>212.95.31.168</dns>
+				<dns>212.95.31.11</dns>
+				<dns>212.95.31.35</dns>
 			</apn>
 		</gsm>
 	</provider>
@@ -189,15 +284,26 @@
 		<gsm>
 			<network-id mcc="232" mnc="05"/>
 			<apn value="web.one.at">
+				<name>OneNet Web</name>
 				<username>web</username>
 				<password>web</password>
 				<dns>194.24.128.100</dns>
 				<dns>194.24.128.102</dns>
 			</apn>
+			<apn value="fullspeed">
+				<name>Web (no filtering)</name>
+				<username>web</username>
+				<password>web</password>
+			</apn>
+			<apn value="orange.web">
+				<name>Orange Web</name>
+				<username>Orange</username>
+				<password>Orange</password>
+			</apn>
 		</gsm>
 	</provider>
 	<provider>
-		<name>Three</name>
+		<name>Drei (3)</name>
 		<name xml:lang="de">Drei</name>
 		<gsm>
 			<network-id mcc="232" mnc="10"/>
@@ -207,6 +313,7 @@
 	<provider>
 		<name>Yesss</name>
 		<gsm>
+			<network-id mcc="232" mnc="12"/>
 			<apn value="web.yesss.at"/>
 		</gsm>
 	</provider>
@@ -217,21 +324,40 @@
 	<provider>
 		<name>Exetel</name>
 		<gsm>
+			<network-id mcc="505" mnc="02"/>
 			<apn value="exetel1"/>
 		</gsm>
 	</provider>
 	<provider>
+		<name>Internode</name>
+		<gsm>
+			<!-- http://www.internode.on.net/residential/broadband/3g_wireless/nodemobile_data/faq/#What_is_the_APN -->
+			<apn value="internode">
+				<name>NodeMobile Data</name>
+			</apn>
+			<apn value="splns333a1">
+				<name>Old NodeMobile Data (before 2009-08-26)</name>
+			</apn>
+		</gsm>
+	</provider>
+	<provider>
 		<name>Optus</name>
 		<gsm>
 			<network-id mcc="505" mnc="02"/>
 			<apn value="internet">
-				<dns>202.139.83.3</dns>
-				<dns>192.65.91.129</dns>
-			</apn>
-			<apn value="CONNECT">
-				<name>Optus 3G</name>
-				<dns>202.139.83.3</dns>
-				<dns>192.65.91.129</dns>
+				<name>Mobile Internet (handsets)</name>
+				<dns>211.29.132.12</dns>
+				<dns>198.142.0.51</dns>
+			</apn>
+			<apn value="connect">
+				<name>Wireless Broadband</name>
+				<dns>211.29.132.12</dns>
+				<dns>198.142.0.51</dns>
+			</apn>
+			<apn value="preconnect">
+				<name>Pre-Paid Mobile Broadband</name>
+				<dns>211.29.132.12</dns>
+				<dns>198.142.0.51</dns>
 			</apn>
 		</gsm>
 	</provider>
@@ -239,6 +365,11 @@
 		<name>Telstra</name>
 		<gsm>
 			<network-id mcc="505" mnc="01"/>
+			<balance-check>
+				<dtmf>125111</dtmf>
+				<dtmf>1258888</dtmf>
+				<ussd-response>*100#</ussd-response>
+			</balance-check>
 			<apn value="telstra.wap">
 				<dns>139.130.4.4</dns>
 				<dns>203.50.2.71</dns>
@@ -284,27 +415,42 @@
 	<provider>
 		<name>Virgin Mobile</name>
 		<gsm>
+			<network-id mcc="505" mnc="02"/>
 			<apn value="VirginInternet">
+				<name>Mobile Internet</name>
 				<username>guest</username>
 				<password>guest</password>
 				<dns>61.88.88.88</dns>
 			</apn>
+			<apn value="VirginBroadband">
+				<name>Mobile Broadband</name>
+			</apn>
 		</gsm>
 	</provider>
 	<provider>
 		<name>Vodafone</name>
 		<gsm>
+			<!-- http://www.vodafone.com.au/personal/mobile-broadband/modem-setup/index.htm -->
 			<network-id mcc="505" mnc="03"/>
 			<apn value="vfinternet.au">
-				<name>Postpaid</name>
-				<dns>192.189.54.33</dns>
-				<dns>210.80.58.3</dns>
+				<name>Postpaid and some prepaid phone plans</name>
 			</apn>
+			<!-- username/password included in Vodafone Broadband Connect version 10.1.0.23908 2010-06-07T17:47:01 -->
+			<!-- username/password not on site http://www.vodafone.com.au/personal/mobile-broadband/modem-setup/index.htm -->
 			<apn value="vfprepaymbb">
 				<name>Prepaid</name>
+				<!-- username>web</username -->
+				<!-- password>web</password -->
 			</apn>
 		</gsm>
 	</provider>
+	<provider>
+		<name>Crazy John's</name>
+		<gsm>
+			<network-id mcc="505" mnc="38"/>
+			<apn value="purtona.net"/>
+		</gsm>
+	</provider>
 </country>
 
 <!-- Azerbaijan -->
@@ -323,6 +469,13 @@
 			<apn value="mms"/>
 		</gsm>
 	</provider>
+	<provider>
+		<name>Azerfon</name>
+		<gsm>
+			<network-id mcc="400" mnc="04"/>
+			<apn value="azerfon"/>
+		</gsm>
+	</provider>
 </country>
 
 <!-- Bosnia & Herzegovina -->
@@ -350,7 +503,7 @@
 <!-- Bangladesh -->
 <country code="bd">
 	<provider>
-		<name>AKTel</name>
+		<name>Robi (AKTel)</name>
 		<gsm>
 			<network-id mcc="470" mnc="02"/>
 			<apn value="internet">
@@ -389,6 +542,16 @@
 			</apn>
 		</gsm>
 	</provider>
+	<provider>
+		<name>Citycell</name>
+		<cdma>
+			<username>waps</username>
+			<password>waps</password>
+			<dns>117.18.224.146</dns>
+			<dns>117.18.224.147</dns>
+			<sid value="13480"/>
+		</cdma>
+	</provider>
 </country>
 
 <!-- Belgium -->
@@ -415,8 +578,8 @@
 				<name>Internet Everywhere</name>
 				<username>mobistar</username>
 				<password>mobistar</password>
-				<dns>212.65.63.10</dns>
-				<dns>212.65.63.145</dns>
+				<dns>212.224.255.252</dns>
+				<dns>212.65.63.217</dns>
 			</apn>
 		</gsm>
 	</provider>
@@ -435,6 +598,7 @@
 	<provider>
 		<name>Orange</name>
 		<gsm>
+			<network-id mcc="206" mnc="10"/>
 			<apn value="orangeinternet"/>
 		</gsm>
 	</provider>
@@ -444,8 +608,6 @@
 			<network-id mcc="206" mnc="01"/>
 			<apn value="internet.proximus.be">
 				<name>Inter</name>
-				<dns>195.238.2.21</dns>
-				<dns>195.238.2.22</dns>
 			</apn>
 			<apn value="intraprox.be">
 				<name>Intra</name>
@@ -461,6 +623,8 @@
 			<apn value="gprs.base.be">
 				<username>base</username>
 				<password>base</password>
+				<dns>195.130.131.139</dns>
+				<dns>212.53.4.4</dns>
 			</apn>
 		</gsm>
 	</provider>
@@ -482,11 +646,11 @@
 		<name>M-Tel</name>
 		<gsm>
 			<network-id mcc="284" mnc="01"/>
+			<!-- http://www.mtel.bg/iphone3/technical_faq.php lists username/password -->
+			<!-- username/password not included in Vodafone Broadband Connect version 10.1.0.23908 2010-06-07T17:47:01 -->
 			<apn value="inet-gprs.mtel.bg">
 				<username>mtel</username>
 				<password>mtel</password>
-				<dns>213.226.7.34</dns>
-				<dns>213.226.7.35</dns>
 			</apn>
 		</gsm>
 	</provider>
@@ -510,6 +674,46 @@
 	</provider>
 </country>
 
+<!-- Bahrain -->
+<country code="bh">
+	<provider>
+		<name>Batelco</name>
+		<gsm>
+			<network-id mcc="426" mnc="01"/>
+			<apn value="internet.batelco.com">
+				<name>oNet</name>
+				<username>wap</username>
+				<password>wap</password>
+			</apn>
+		</gsm>
+	</provider>
+	<provider>
+		<name>Zain BH</name>
+		<gsm>
+			<network-id mcc="426" mnc="02"/>
+			<apn value="internet">
+				<name>Internet</name>
+				<username>internet</username>
+				<password>internet</password>
+			</apn>
+			<apn value="hsdpa">
+				<name>eGO</name>
+				<username>hsdpa</username>
+				<password>hsdpa</password>
+			</apn>
+		</gsm>
+	</provider>
+	<provider>
+		<name>STC</name>
+		<gsm>
+			<network-id mcc="426" mnc="04"/>
+			<apn value="viva.bh">
+				<name>Viva</name>
+			</apn>
+		</gsm>
+	</provider>
+</country>
+
 <!-- Brazil -->
 <country code="br">
 	<provider>
@@ -518,6 +722,7 @@
 		  -->
 		<name>Brasil Telecom</name>
 		<gsm>
+			<network-id mcc="724" mnc="16"/>
 			<apn value="brt.br">
 				<username>BrT</username>
 				<password>BrT</password>
@@ -723,6 +928,24 @@
 	</provider>
 </country>
 
+<!-- Burundi -->
+<country code="bi">
+	<provider>
+		<name>Leo/UCom</name>
+		<gsm>
+			<network-id mcc="642" mnc="03"/>
+			<apn value="ucnet"/>
+		</gsm>
+	</provider>
+	<provider>
+		<name>Tempo/Africell</name>
+		<gsm>
+			<network-id mcc="642" mnc="02"/>
+			<apn value="internet"/>
+		</gsm>
+	</provider>
+</country>
+
 <!-- Canada -->
 <country code="ca">
 	<provider>
@@ -751,6 +974,18 @@
 	</provider>
 	<provider>
 		<name>Bell Mobility</name>
+		<gsm>
+			<network-id mcc="302" mnc="610"/>
+			<network-id mcc="302" mnc="640"/>
+			<network-id mcc="302" mnc="651"/>
+			<network-id mcc="302" mnc="880"/>
+			<apn value="inet.bell.ca">
+				<name>Internet</name>
+			</apn>
+			<apn value="pda.bell.ca">
+				<name>Mobile Web</name>
+			</apn>
+		</gsm>
 		<cdma>
 			<sid value="16420"/>
 			<sid value="16440"/>
@@ -781,6 +1016,23 @@
 	</provider>
 	<provider>
 		<name>Telus Mobility</name>
+		<gsm>
+			<network-id mcc="302" mnc="220"/>
+			<network-id mcc="302" mnc="860"/>
+			<network-id mcc="302" mnc="880"/>
+			<apn value="isp.telus.com">
+				<name>Internet</name>
+			</apn>
+			<apn value="vpn.telus.com">
+				<name>Internet (with VPN)</name>
+			</apn>
+			<apn value="bb.telus.com">
+				<name>Blackberry</name>
+			</apn>
+			<apn value="sp.telus.com">
+				<name>Mobile Web/Smartphone</name>
+			</apn>
+		</gsm>
 		<cdma>
 			<sid value="16422"/>
 			<sid value="17500"/>
@@ -802,6 +1054,40 @@
 			<sid value="16412"/>
 		</cdma>
 	</provider>
+	<provider>
+		<name>Vidéotron</name>
+		<gsm>
+			<network-id mcc="302" mnc="500"/>
+			<network-id mcc="302" mnc="510"/>
+			<apn value="ihvm.videotron">
+				<name>IHVM</name>
+			</apn>
+		</gsm>
+	</provider>
+	<provider>
+		<name>WIND Mobile</name>
+		<gsm>
+			<network-id mcc="302" mnc="490"/>
+			<apn value="broadband.windmobile.ca">
+				<name>Laptop (data stick)</name>
+			</apn>
+			<apn value="internet.windmobile.ca">
+				<name>Mobile (add-on for phone)</name>
+			</apn>
+		</gsm>
+	</provider>
+	<provider>
+		<name>Mobilicity</name>
+		<gsm>
+			<network-id mcc="302" mnc="320"/>
+			<apn value="wap.davewireless.com">
+				<name>Mobile Web</name>
+			</apn>
+			<apn value="internet.davewireless.com">
+				<name>Mobile Broadband</name>
+			</apn>
+		</gsm>
+	</provider>
 </country>
 
 <!-- Congo (Dem. Rep.) -->
@@ -812,7 +1098,6 @@
 			<network-id mcc="630" mnc="01"/>
 			<apn value="vodanet">
 				<username>vodalive</username>
-				<dns>172.24.97.1</dns>
 			</apn>
 		</gsm>
 	</provider>
@@ -829,9 +1114,16 @@
 		<gsm>
 			<network-id mcc="228" mnc="03"/>
 			<apn value="mobileoffice3g">
+				<name>Internet Everywhere - Standard</name>
 				<dns>213.55.128.1</dns>
 				<dns>213.55.128.2</dns>
 			</apn>
+			<apn value="click">
+				<name>Internet Everywhere - Prepaid</name>
+			</apn>
+			<apn value="intranetaccess">
+				<name>Internet Everywhere - Intranet Access</name>
+			</apn>
 		</gsm>
 	</provider>
 	<provider>
@@ -849,11 +1141,16 @@
 	<provider>
 		<name>Swisscom</name>
 		<gsm>
+			<!-- username/password not included in Vodafone Broadband Connect version 10.1.0.23908 2010-06-07T17:47:01 -->
+			<!-- http://www.swisscom.ch/res/hilfe/mobile/einstellungen/index.htm -->
 			<network-id mcc="228" mnc="01"/>
-			<apn value="gprs.swisscom.ch">
-				<username>gprs</username>
-				<password>gprs</password>
-			</apn>
+			<balance-check>
+				<ussd>*130#</ussd>
+			</balance-check>
+			<balance-top-up>
+				<ussd replacement="CODE">*130*CODE#</ussd>
+			</balance-top-up>
+			<apn value="gprs.swisscom.ch"/>
 		</gsm>
 	</provider>
 </country>
@@ -898,6 +1195,7 @@
 		<gsm>
 			<network-id mcc="730" mnc="01"/>
 			<apn value="imovil.entelpcs.cl">
+				<name>Contract / Prepaid / WebSession</name>
 				<username>entelpcs</username>
 				<password>entelpcs</password>
 			</apn>
@@ -957,7 +1255,13 @@
 		<gsm>
 			<network-id mcc="460" mnc="00"/>
 			<network-id mcc="460" mnc="02"/>
+			<apn value="cmwap">
+				<name>WAP</name>
+				<username>guest</username>
+				<password>guest</password>
+			</apn>
 			<apn value="cmnet">
+				<name>Internet</name>
 				<username>guest</username>
 				<password>guest</password>
 				<dns>211.136.20.203</dns>
@@ -973,6 +1277,15 @@
 			</apn>
 		</gsm>
 	</provider>
+	<provider>
+		<name>China Telecom</name>
+		<cdma>
+			<username>ctnet at mycdma.cn</username>
+			<password>vnet.mobi</password>
+			<sid value="11296"/>
+			<sid value="11298"/>
+		</cdma>
+	</provider>
 </country>
 
 <!-- Costa Rica -->
@@ -1024,86 +1337,57 @@
 	</provider>
 </country>
 
-<!-- Czech Republic -->
-<country code="cz">
+<!-- Cyprus -->
+<country code="cy">
 	<provider>
-		<name>Cesky Mobil</name>
+		<name>Cytamobile-Vodafone</name>
 		<gsm>
-			<network-id mcc="230" mnc="98"/>
+			<network-id mcc="280" mnc="01"/>
 			<apn value="internet">
-				<name>Postpaid</name>
-				<dns>212.67.64.2</dns>
-				<dns>217.77.161.131</dns>
+				<name>Contract</name>
 			</apn>
-			<apn value="Cinternet">
+			<apn value="pp.internet">
 				<name>Prepaid</name>
-				<dns>212.67.64.2</dns>
-				<dns>217.77.161.131</dns>
 			</apn>
 		</gsm>
 	</provider>
 	<provider>
-		<name>EuroTel / Telefónica</name>
+		<name>MTN</name>
 		<gsm>
-			<network-id mcc="230" mnc="02"/>
-			<apn value="gointernet">
-				<name>Go</name>
-				<dns>160.218.10.200</dns>
-				<dns>160.218.43.200</dns>
-			</apn>
+			<network-id mcc="280" mnc="10"/>
 			<apn value="internet">
-				<name>Contract</name>
-				<dns>160.218.10.200</dns>
-				<dns>160.218.43.200</dns>
-			</apn>
-			<apn value="internet.open">
-				<name>Contract (Open)</name>
-				<dns>160.218.10.200</dns>
-				<dns>160.218.43.200</dns>
+				<username>wap</username>
+				<password>wap</password>
 			</apn>
 		</gsm>
 	</provider>
+</country>
+
+<!-- Czech Republic -->
+<country code="cz">
 	<provider>
-		<name>Oscar</name>
+		<name>Vodafone</name>
 		<gsm>
 			<network-id mcc="230" mnc="03"/>
-			<apn value="internet">
-				<name>Postpaid</name>
-				<username>wap</username>
-				<password>wap</password>
-				<dns>217.77.161.130</dns>
-				<dns>217.77.161.131</dns>
-			</apn>
-			<apn value="ointernet">
-				<name>Prepaid</name>
-				<dns>217.77.161.130</dns>
-				<dns>217.77.161.131</dns>
-			</apn>
+			<apn value="internet"/>
 		</gsm>
 	</provider>
 	<provider>
-		<name>Paegas Internet</name>
+		<name>O2</name>
 		<gsm>
-			<apn value="internet.click.cz">
-				<name>Internet</name>
-				<dns>62.141.0.1</dns>
-				<dns>62.141.0.2</dns>
+			<network-id mcc="230" mnc="02"/>
+			<apn value="internet">
+				<dns>160.218.10.200</dns>
+				<dns>160.218.43.200</dns>
 			</apn>
-			<apn value="profil.click.cz">
-				<name>Profil</name>
-				<dns>62.141.0.1</dns>
-				<dns>62.141.0.2</dns>
+			<apn value="internet.open">
+				<dns>160.218.10.200</dns>
+				<dns>160.218.43.200</dns>
 			</apn>
 		</gsm>
 	</provider>
 	<provider>
-		<name>Radiomibil</name>
-		<gsm>
-			<apn value="internet.click.cz"/>
-		</gsm>
-	</provider>
-	<provider>
-		<name>T-Mobil</name>
+		<name>T-Mobile</name>
 		<gsm>
 			<network-id mcc="230" mnc="01"/>
 			<apn value="internet.t-mobile.cz">
@@ -1122,48 +1406,106 @@
 			<network-id mcc="262" mnc="03"/>
 			<network-id mcc="262" mnc="05"/>
 			<network-id mcc="262" mnc="77"/>
+			<balance-check>
+				<ussd>*100#</ussd>
+			</balance-check>
+			<balance-top-up>
+				<ussd replacement="CODE">*104*CODE#</ussd>
+			</balance-top-up>
 			<apn value="internet.eplus.de">
+				<name>Volume rate/30 Day Flatrate</name>
 				<username>eplus</username>
 				<password>gprs</password>
 				<dns>212.23.97.2</dns>
 				<dns>212.23.97.3</dns>
 			</apn>
-		</gsm>
-	</provider>
-	<provider>
-		<name>blau.de</name>
-		<gsm>
-			<network-id mcc="262" mnc="03"/>
-			<network-id mcc="262" mnc="05"/>
-			<network-id mcc="262" mnc="77"/>
-			<apn value="internet.eplus.de">
+			<apn value="tagesflat.eplus.de">
+				<name>24 Hour Flatrate</name>
+				<name xml:lang="de">Tages-Flatrate</name>
 				<username>eplus</username>
 				<password>gprs</password>
 			</apn>
 		</gsm>
 	</provider>
 	<provider>
-		<name>E-Plus</name>
+		<name>blau.de</name>
 		<gsm>
 			<network-id mcc="262" mnc="03"/>
 			<network-id mcc="262" mnc="05"/>
 			<network-id mcc="262" mnc="77"/>
 
+			<balance-check>
+				<ussd>*100#</ussd>
+			</balance-check>
+			<balance-top-up>
+				<ussd replacement="CODE">*104*CODE#</ussd>
+			</balance-top-up>
 			<apn value="internet.eplus.de">
-				<username>eplus</username>
-				<password>gprs</password>
-				<dns>212.23.97.2</dns>
-				<dns>212.23.97.3</dns>
+				<username>blau</username>
+				<password>blau</password>
+			</apn>
+			<apn value="tagesflat.eplus.de">
+				<name>24 Hour Flatrate</name>
+				<name xml:lang="de">Tages-Flatrate</name>
+				<username>blau</username>
+				<password>blau</password>
 			</apn>
 		</gsm>
 	</provider>
 	<provider>
-		<name>o2</name>
+		<name>Bild Mobil</name>
 		<gsm>
-			<network-id mcc="262" mnc="07"/>
+			<!-- http://www.bildmobil.de/info_handyeinstellungen.html -->
+			<network-id mcc="262" mnc="02"/>
+			<apn value="access.vodafone.de">
+				<name>BILD Mobilportal</name>
+			</apn>
+			<apn value="web.vodafone.de">
+				<name>Contract</name>
+				<dns>139.7.30.125</dns>
+				<dns>139.7.30.126</dns>
+			</apn>
+		</gsm>
+	</provider>
+	<provider>
+		<name>E-Plus</name>
+		<gsm>
+			<network-id mcc="262" mnc="03"/>
+			<network-id mcc="262" mnc="05"/>
+			<network-id mcc="262" mnc="77"/>
+
+			<balance-check>
+				<ussd>*100#</ussd>
+			</balance-check>
+			<balance-top-up>
+				<ussd replacement="CODE">*104*CODE#</ussd>
+			</balance-top-up>
+			<apn value="internet.eplus.de">
+				<username>eplus</username>
+				<password>gprs</password>
+				<dns>212.23.97.2</dns>
+				<dns>212.23.97.3</dns>
+			</apn>
+		</gsm>
+	</provider>
+	<provider>
+		<name>O2</name>
+		<gsm>
+			<network-id mcc="262" mnc="07"/>
 			<network-id mcc="262" mnc="08"/>
 			<network-id mcc="262" mnc="11"/>
 
+			<balance-check>
+				<ussd>*101#</ussd>
+			</balance-check>
+			<balance-top-up>
+				<ussd replacement="CODE">*103*CODE#</ussd>
+			</balance-top-up>
+			<apn value="pinternet.interkom.de">
+				<name>LOOP</name>
+				<dns>193.189.244.225</dns>
+				<dns>193.189.244.206</dns>
+			</apn>
 			<apn value="internet">
 				<name>Pay-by-MB</name>
 				<dns>195.182.110.132</dns>
@@ -1177,16 +1519,59 @@
 		</gsm>
 	</provider>
 	<provider>
+		<name>Tchibo-Mobil</name>
+		<gsm>
+			<network-id mcc="262" mnc="07"/>
+			<network-id mcc="262" mnc="08"/>
+			<network-id mcc="262" mnc="11"/>
+
+			<balance-check>
+				<ussd>*101#</ussd>
+			</balance-check>
+			<balance-top-up>
+				<ussd replacement="CODE">*103*CODE#</ussd>
+			</balance-top-up>
+			<apn value="webmobil1">
+				<name>Tagesflat / Monats-Flatrate L / Monats-Flatrate XL</name>
+			</apn>
+		</gsm>
+	</provider>
+	<provider>
 		<name>T-mobile (D1)</name>
 		<gsm>
 			<network-id mcc="262" mnc="01"/>
 			<network-id mcc="262" mnc="06"/>
 
+			<balance-check>
+				<ussd>*100#</ussd>
+			</balance-check>
+			<balance-top-up>
+				<ussd replacement="CODE">*101*CODE#</ussd>
+			</balance-top-up>
 			<apn value="internet.t-d1.de">
 				<password>t-d1</password>
 				<dns>193.254.160.1</dns>
 				<dns>193.254.160.130</dns>
 			</apn>
+			<apn value="internet.t-mobile">
+				<username>t-mobile</username>
+				<password>tm</password>
+				<dns>10.74.83.22</dns>
+				<dns>193.254.160.1</dns>
+			</apn>
+		</gsm>
+	</provider>
+	<provider>
+		<name>CongStar</name>
+		<gsm>
+			<network-id mcc="262" mnc="01"/>
+
+			<apn value="internet.t-mobile">
+				<username>t-mobile</username>
+				<password>tm</password>
+				<dns>193.254.160.1</dns>
+				<dns>10.74.83.22</dns>
+			</apn>
 		</gsm>
 	</provider>
 	<provider>
@@ -1196,6 +1581,12 @@
 			<network-id mcc="262" mnc="04"/>
 			<network-id mcc="262" mnc="09"/>
 
+			<balance-check>
+				<ussd>*100#</ussd>
+			</balance-check>
+			<balance-top-up>
+				<ussd replacement="CODE">*100*CODE#</ussd>
+			</balance-top-up>
 			<apn value="web.vodafone.de">
 				<username>vodafone</username>
 				<password>vodafone</password>
@@ -1217,14 +1608,44 @@
 			<network-id mcc="262" mnc="07"/>
 			<network-id mcc="262" mnc="08"/>
 			<network-id mcc="262" mnc="11"/>
+			<balance-check>
+				<ussd>*101#</ussd>
+			</balance-check>
+			<balance-top-up>
+				<ussd replacement="CODE">*103*CODE#</ussd>
+			</balance-top-up>
 			<apn value="pinternet.interkom.de"/>
 		</gsm>
 	</provider>
 	<provider>
+		<name>simyo Internet</name>
+		<gsm>
+			<network-id mcc="262" mnc="03"/>
+			<network-id mcc="262" mnc="05"/>
+			<network-id mcc="262" mnc="77"/>
+			<balance-check>
+				<ussd>*100#</ussd>
+			</balance-check>
+			<balance-top-up>
+				<ussd replacement="CODE">*104*CODE#</ussd>
+			</balance-top-up>
+			<apn value="internet.eplus.de">
+				<username>simyo</username>
+				<password>simyo</password>
+				<dns>212.23.97.2</dns>
+				<dns>212.23.97.3</dns>
+			</apn>
+		</gsm>
+	</provider>
+	<provider>
 		<!-- This configuration is valid for all vistream retailers like
 		     solomo, igge & ko, sdt.net, Südkurier-Tel etc.-->
 		<name>vistream</name>
 		<gsm>
+			<network-id mcc="262" mnc="16"/>
+			<balance-check>
+				<ussd>*100#</ussd>
+			</balance-check>
 			<apn value="internet.vistream.net">
 				<username>web</username>
 				<password>vistream</password>
@@ -1234,6 +1655,10 @@
 	<provider>
 		<name>solomo</name>
 		<gsm>
+			<network-id mcc="262" mnc="16"/>
+			<balance-check>
+				<ussd>*100#</ussd>
+			</balance-check>
 			<apn value="internet.vistream.net">
 				<username>web</username>
 				<password>vistream</password>
@@ -1243,6 +1668,7 @@
 	<provider>
 		<name>Materna BR</name>
 		<gsm>
+			<network-id mcc="262" mnc="16"/>
 			<apn value="internet.vistream.net">
 				<username>web</username>
 				<password>vistream</password>
@@ -1252,6 +1678,7 @@
 	<provider>
 		<name>sdt.net</name>
 		<gsm>
+			<network-id mcc="262" mnc="16"/>
 			<apn value="internet.vistream.net">
 				<username>web</username>
 				<password>vistream</password>
@@ -1261,6 +1688,7 @@
 	<provider>
 		<name>igge & ko</name>
 		<gsm>
+			<network-id mcc="262" mnc="16"/>
 			<apn value="internet.vistream.net">
 				<username>web</username>
 				<password>vistream</password>
@@ -1270,6 +1698,7 @@
 	<provider>
 		<name>PTT mobile</name>
 		<gsm>
+			<network-id mcc="262" mnc="16"/>
 			<apn value="internet.vistream.net">
 				<username>web</username>
 				<password>vistream</password>
@@ -1279,6 +1708,7 @@
 	<provider>
 		<name>TouristMobile</name>
 		<gsm>
+			<network-id mcc="262" mnc="16"/>
 			<apn value="internet.vistream.net">
 				<username>web</username>
 				<password>vistream</password>
@@ -1288,6 +1718,10 @@
 	<provider>
 		<name>SunSIM</name>
 		<gsm>
+			<network-id mcc="262" mnc="16"/>
+			<balance-check>
+				<ussd>*100#</ussd>
+			</balance-check>
 			<apn value="internet.vistream.net">
 				<username>web</username>
 				<password>vistream</password>
@@ -1297,6 +1731,7 @@
 	<provider>
 		<name>SüdkurierTel</name>
 		<gsm>
+			<network-id mcc="262" mnc="16"/>
 			<apn value="internet.vistream.net">
 				<username>web</username>
 				<password>vistream</password>
@@ -1306,12 +1741,54 @@
 	<provider>
 		<name>NetCologne</name>
 		<gsm>
+			<network-id mcc="262" mnc="03"/>
 			<apn value="internet.netcologne.de">
 				<username>web</username>
 				<password>password</password>
 			</apn>
 		</gsm>
 	</provider>
+	<provider>
+		<name>Alice</name>
+		<gsm>
+			<network-id mcc="262" mnc="07"/>
+			<apn value="internet.partner1">
+				<name>Option Mobile</name>
+				<dns>193.189.244.225</dns>
+				<dns>193.189.244.206</dns>
+			</apn>
+		</gsm>
+	</provider>
+	<provider>
+		<name>1&1</name>
+		<gsm>
+			<!-- Vodafone (D2) network -->
+			<network-id mcc="262" mnc="02"/>
+			<network-id mcc="262" mnc="04"/>
+			<network-id mcc="262" mnc="09"/>
+			<apn value="web.vodafone.de">
+				<name>Mobile Broadband</name>
+			</apn>
+			<apn value="mail.partner.de">
+				<name>Mobile Web</name>
+				<username>D2</username>
+				<password>Web</password>
+			</apn>
+		</gsm>
+	</provider>
+	<provider>
+		<name>Netzclub</name>
+		<gsm>
+			<!-- O2 network -->
+			<network-id mcc="262" mnc="07"/>
+			<network-id mcc="262" mnc="08"/>
+			<network-id mcc="262" mnc="11"/>
+			<apn value="pinternet.interkom.de">
+				<!-- Information taken from https://www.netzclub.net/downloads/default/Manuelle_Handyeinstellungen.pdf -->
+				<name>Internet</name>
+			</apn>
+		</gsm>
+	</provider>
 </country>
 
 <!-- Denmark -->
@@ -1321,13 +1798,16 @@
 		<gsm>
 			<network-id mcc="238" mnc="06"/>
 			<apn value="bredband.tre.dk">
-				<name>Bredbånd</name>
+				<name>Bredbånd (standard)</name>
  			</apn>
 			<apn value="net.tre.dk">
 				<name>Bredbånd Premium Kontant</name>
 			</apn>
 			<apn value="data.tre.dk">
-				<name>3 (Mobil Abonnement)</name>
+				<name>3 (standard for mobilkunder; spærret for indgående trafik)</name>
+			</apn>
+			<apn value="static.tre.dk">
+				<name>3 (statisk IP)</name>
 			</apn>
 		</gsm>
 	</provider>
@@ -1349,14 +1829,26 @@
 		</cdma>
 	</provider>
 	<provider>
-		<name>Sonofon</name>
+		<name>Telenor</name>
 		<gsm>
+			<network-id mcc="238" mnc="02"/>
+			<network-id mcc="238" mnc="77"/>
 			<apn value="internet">
 				<dns>212.88.64.199</dns>
 				<dns>212.88.64.14</dns>
 			</apn>
 		</gsm>
 	</provider>
+
+	<!-- http://www.cbb.dk/mobil/hjaelp/manuel-opsaetning-af-mms-og-gprs/ -->
+	<provider>
+		<name>CBB Mobil</name>
+		<gsm>
+			<network-id mcc="238" mnc="02"/>
+			<network-id mcc="238" mnc="77"/>
+			<apn value="internet"/>
+		</gsm>
+	</provider>
 	<provider>
 		<name>TDC</name>
 		<gsm>
@@ -1365,6 +1857,7 @@
 				<dns>194.239.134.83</dns>
 				<dns>193.162.153.164</dns>
 			</apn>
+			<apn value="internet.no"/>
 		</gsm>
 	</provider>
 	<provider>
@@ -1386,9 +1879,35 @@
 	<provider>
 		<name>BiBoB</name>
 		<gsm>
+			<network-id mcc="238" mnc="02"/>
 			<apn value="internet.bibob.dk"/>
 		</gsm>
 	</provider>
+	<!-- Telmore - Same network as TDC -->
+	<provider>
+		<name>Telmore</name>
+		<gsm>
+			<network-id mcc="238" mnc="01"/>
+			<apn value="internet">
+				<dns>194.239.134.83</dns>
+				<dns>193.162.153.164</dns>
+			</apn>
+		</gsm>
+	</provider>
+	<provider>
+		<name>Unotel</name>
+		<gsm>
+			<network-id mcc="238" mnc="01"/>
+			<apn value="internet"/>
+		</gsm>
+	</provider>
+	<provider>
+		<name>happiimobil</name>
+		<gsm>
+			<network-id mcc="238" mnc="01"/>
+			<apn value="internet"/>
+		</gsm>
+	</provider>
 </country>
 
 <!-- Dominican Republic -->
@@ -1397,9 +1916,42 @@
 		<name>Orange</name>
 		<gsm>
 			<network-id mcc="370" mnc="01"/>
+			<voicemail>*777</voicemail>
+			<balance-check>
+				<ussd>#131#</ussd>
+			</balance-check>
 			<apn value="orangenet.com.do"/>
 		</gsm>
 	</provider>
+	<provider>
+		<name>Claro</name>
+		<gsm>
+			<network-id mcc="370" mnc="02"/>
+			<voicemail>*99</voicemail>
+			<balance-check>
+				<ussd>*122#</ussd>
+				<dtmf>*22</dtmf>
+			</balance-check>
+			<apn value="internet.ideasclaro.com.do">
+				<dns>196.3.81.5</dns>
+				<dns>196.3.81.132</dns>
+			</apn>
+		</gsm>
+	</provider>
+	<provider>
+		<name>Viva</name>
+		<gsm>
+			<network-id mcc="370" mnc="04"/>
+			<balance-check>
+				<ussd>#111#</ussd>
+				<dtmf>*74</dtmf>
+			</balance-check>
+			<apn value="edge.viva.net.do">
+				<username>viva</username>
+				<password>viva</password>
+			</apn>
+		</gsm>
+	</provider>
 </country>
 
 <!-- Algeria -->
@@ -1437,6 +1989,16 @@
 <!-- Ecuador -->
 <country code="ec">
 	<provider>
+		<name>Movistar UMTS</name>
+		<gsm>
+			<network-id mcc="740" mnc="00"/>
+			<apn value="navega.movistar.ec">
+				<username>movistar</username>
+				<password>movistar</password>
+			</apn>
+		</gsm>
+	</provider>
+	<provider>
 		<name>Porta 3G</name>
 		<gsm>
 			<network-id mcc="740" mnc="01"/>
@@ -1467,6 +2029,7 @@
 	<provider>
 		<name>Elisa</name>
 		<gsm>
+			<network-id mcc="248" mnc="02"/>
 			<apn value="internet">
 				<dns>194.204.0.1</dns>
 			</apn>
@@ -1493,6 +2056,8 @@
 			<apn value="internet.vodafone.net">
 				<username>internet</username>
 				<password>internet</password>
+				<dns>163.121.128.134</dns>
+				<dns>212.103.160.18</dns>
 			</apn>
 		</gsm>
 	</provider>
@@ -1530,6 +2095,7 @@
 	<provider>
 		<name>Másmovil</name>
 		<gsm>
+			<network-id mcc="214" mnc="03"/>
 			<apn value="internetmas" />
 		</gsm>
 	</provider>
@@ -1541,7 +2107,17 @@
 		</gsm>
 	</provider>
 	<provider>
-		<name>Ono</name>
+		<name>moviData</name>
+		<gsm>
+			<network-id mcc="214" mnc="03"/>
+			<apn value="INTERNETTPH">
+				<dns>213.143.33.8</dns>
+				<dns>62.36.225.150</dns>
+			</apn>
+		</gsm>
+	</provider>
+	<provider>
+		<name>ONO</name>
 		<gsm>
 			<network-id mcc="214" mnc="18"/>
 			<apn value="internet.ono.com">
@@ -1553,27 +2129,32 @@
 	<provider>
 		<name>Pepephone</name>
 		<gsm>
+			<network-id mcc="214" mnc="06"/>
 			<apn value="gprs.pepephone.com" />
 		</gsm>
 	</provider>
 	<provider>
-		<name>Orange (Amena)</name>
+		<name>Orange</name>
 		<gsm>
 			<network-id mcc="214" mnc="03"/>
 			<network-id mcc="214" mnc="09"/>
 			<apn value="internet">
-				<username>CLIENTE</username>
-				<password>AMENA</password>
-				<dns>213.143.32.20</dns>
-				<dns>213.143.33.8</dns>
+				<name>Orange</name>
+				<username>ORANGE</username>
+				<password>ORANGE</password>
+				<dns>85.62.229.133</dns>
+				<dns>85.62.229.134</dns>
 			</apn>
 		</gsm>
 	</provider>
 	<provider>
-		<name>Simyo</name>
+		<name>Simyo/Blau</name>
 		<gsm>
 			<network-id mcc="214" mnc="19"/>
-			<apn value="gprs-service.com"/>
+			<apn value="gprs-service.com">
+				<dns>195.230.105.134</dns>
+				<dns>195.230.105.135</dns>
+			</apn>
 		</gsm>
 	</provider>
 	<provider>
@@ -1587,8 +2168,9 @@
 		</gsm>
 	</provider>
 	<provider>
-		<name>movistar (Telefonica)</name>
+		<name>Movistar (Telefónica)</name>
 		<gsm>
+			<network-id mcc="214" mnc="05"/>
 			<network-id mcc="214" mnc="07"/>
 			<apn value="movistar.es">
 				<username>movistar</username>
@@ -1604,24 +2186,56 @@
 			<network-id mcc="214" mnc="01"/>
 			<network-id mcc="214" mnc="06"/>
 			<apn value="airtelnet.es">
+				<name>Airtel (old)</name>
 				<username>vodafone</username>
 				<password>vodafone</password>
 				<dns>212.73.32.3</dns>
 				<dns>212.73.32.67</dns>
 			</apn>
+			<apn value="ac.vodafone.es">
+				<name>Vodafone</name>
+				<username>vodafone</username>
+				<password>vodafone</password>
+				<dns>212.166.132.96</dns>
+				<dns>212.73.32.67</dns>
+			</apn>
 		</gsm>
 	</provider>
 	<provider>
 		<name>Yoigo</name>
 		<gsm>
 			<network-id mcc="214" mnc="04"/>
-			<apn value="Internet"/>
+			<apn value="internet">
+				<dns>213.248.76.210</dns>
+				<dns>213.248.100.54</dns>
+			</apn>
 		</gsm>
 	</provider>
 	<provider>
 		<name>Jazztel</name>
 		<gsm>
-			<apn value="jazzinternet"/>
+			<network-id mcc="214" mnc="21"/>
+			<apn value="jazzinternet">
+				<dns>87.216.1.65</dns>
+				<dns>87.216.1.66</dns>
+			</apn>
+		</gsm>
+	</provider>
+	<provider>
+		<name>Carrefour Móvil</name>
+		<gsm>
+			<apn value="CARREFOURINTERNET"/>
+		</gsm>
+	</provider>
+</country>
+
+<!-- Faroe Islands -->
+<country code="fo">
+	<provider>
+		<name>Vodafone FO</name>
+		<gsm>
+			<network-id mcc="288" mnc="02"/>
+			<apn value="vmc.vodafone.fo"/>
 		</gsm>
 	</provider>
 </country>
@@ -1649,20 +2263,28 @@
 		<name>Saunalahti</name>
 		<gsm>
 			<network-id mcc="244" mnc="21"/>
-			<apn value="internet.saunalahti"/>
+			<apn value="internet.saunalahti">
+				<name>Postpaid (contract)</name>
+				<dns>192.89.123.230</dns>
+				<dns>192.89.123.231</dns>
+			</apn>
+			<apn value="internet">
+				<name>Prepaid (no contract)</name>
+				<dns>192.89.123.230</dns>
+				<dns>192.89.123.231</dns>
+			</apn>
 		</gsm>
 	</provider>
 	<provider>
 		<name>Sonera</name>
 		<gsm>
 			<network-id mcc="244" mnc="91"/>
-
 			<apn value="internet">
 				<dns>192.89.123.230</dns>
 				<dns>192.89.123.231</dns>
 			</apn>
 			<apn value="prointernet">
-				<name>Prointernet</name>
+				<name>Prointernet (public IP)</name>
 				<dns>192.89.123.230</dns>
 				<dns>192.89.123.231</dns>
 			</apn>
@@ -1681,10 +2303,11 @@
 <!-- Fiji -->
 <country code="fj">
 	<provider>
-		<name>Vodafone</name>
+		<name>Vodafone / Kidanet</name>
 		<gsm>
 			<network-id mcc="542" mnc="01"/>
 			<apn value="vfinternet.fj"/>
+			<apn value="kidanet.fj"/>
 		</gsm>
 	</provider>
 </country>
@@ -1702,22 +2325,25 @@
 		<gsm>
 			<network-id mcc="208" mnc="20"/>
 			<network-id mcc="208" mnc="21"/>
+			<apn value="a2bouygtel.com">
+				<name>Contrat Pro Data Illimité</name>
+				<dns>62.201.129.99</dns>
+			</apn>
 			<apn value="b2bouygtel.com">
 				<name>B2Bouygtel</name>
 				<dns>62.201.129.99</dns>
 			</apn>
 			<apn value="ebouygtel.com">
+				<name>Forfait Data</name>
 				<dns>62.201.129.99</dns>
 			</apn>
-		</gsm>
-	</provider>
-	<provider>
-		<name>France Telecom</name>
-		<gsm>
-			<network-id mcc="208" mnc="01"/>
-			<network-id mcc="208" mnc="00"/>
-			<apn value="orange.fr.mnc001.mcc208.gprs">
-				<username>gprs</username>
+			<apn value="mmsbouygtel.com">
+				<name>Forfait Data</name>
+				<dns>62.201.129.99</dns>
+			</apn>
+			<apn value="pcebouygtel.com">
+				<name>Contrat Pro Data</name>
+				<dns>62.201.129.99</dns>
 			</apn>
 		</gsm>
 	</provider>
@@ -1762,23 +2388,40 @@
 	<provider>
 		<name>SFR</name>
 		<gsm>
+			<!-- http://assistance.sfr.fr/internet-partout/Mobile/difference-wap-web/fc-2302-62196 -->
 			<network-id mcc="208" mnc="10"/>
 			<network-id mcc="208" mnc="11"/>
 			<apn value="websfr">
-				<dns>172.20.2.10</dns>
-				<dns>172.20.2.39</dns>
+				<name>Web / Prepaid</name>
+			</apn>
+			<apn value="wapsfr">
+				<name>WAP</name>
+			</apn>
+			<apn value="internetpro">
+				<name>SFR internetpro</name>
+			</apn>
+			<apn value="ipnet">
+				<name>SFR ipnet</name>
+			</apn>
+			<apn value="slsfr">
+				<name>Mobile Broadband</name>
+			</apn>
+			<apn value="sl2sfr">
+				<name>Full Internet (Webphone)</name>
 			</apn>
 		</gsm>
 	</provider>
 	<provider>
 		<name>Transatel Telecom</name>
 		<gsm>
+			<network-id mcc="208" mnc="22"/>
 			<apn value="netgprs.com"/>
 		</gsm>
 	</provider>
 	<provider>
 		<name>TEN</name>
 		<gsm>
+			<network-id mcc="208" mnc="01"/>
 			<apn value="ao.fr">
 				<username>orange</username>
 				<password>orange</password>
@@ -1797,6 +2440,7 @@
 	<provider>
 		<name>airtel vodaphone</name>
 		<gsm>
+			<network-id mcc="234" mnc="03"/>
 			<apn value="airtel-ci-gprs.com"/>
 		</gsm>
 	</provider>
@@ -1811,24 +2455,16 @@
 		</gsm>
 	</provider>
 	<provider>
-		<name>Jersey Telecom</name>
-		<gsm>
-			<network-id mcc="234" mnc="50"/>
-			<apn value="pepper">
-				<username>abc</username>
-				<password>abc</password>
-				<dns>212.9.0.135</dns>
-				<dns>212.9.0.136</dns>
-			</apn>
-		</gsm>
-	</provider>
-	<provider>
-		<name>o2</name>
+		<name>O2</name>
 		<gsm>
 			<network-id mcc="234" mnc="02"/>
 			<network-id mcc="234" mnc="10"/>
 			<network-id mcc="234" mnc="11"/>
-
+			<voicemail>901</voicemail>
+			<balance-check>
+				<ussd>*#10#</ussd>
+				<dtmf>4444</dtmf>
+			</balance-check>
 			<apn value="mobile.o2.co.uk">
 				<name>Contract</name>
 				<username>o2web</username>
@@ -1844,22 +2480,49 @@
 				<dns>193.113.200.201</dns>
 			</apn>
 			<apn value="payandgo.o2.co.uk">
-				<name>Prepaid</name>
+				<name>Pay and Go (Prepaid)</name>
 				<username>payandgo</username>
 				<password>payandgo</password>
 			</apn>
+			<apn value="idata.o2.co.uk">
+				<name>iPhone (Contract)</name>
+				<username>vertigo</username>
+				<password>password</password>
+			</apn>
+			<apn value="m-bb.o2.co.uk">
+				<name>Mobile Broadband</name>
+				<username>o2bb</username>
+				<password>password</password>
+				<dns>82.132.254.2</dns>
+				<dns>82.132.254.3</dns>
+			</apn>
+			<apn value="wap.o2.co.uk">
+				<name>WAP</name>
+				<username>o2wap</username>
+				<password>password</password>
+			</apn>
 		</gsm>
 	</provider>
 	<provider>
 		<name>T-Mobile</name>
 		<gsm>
 			<network-id mcc="234" mnc="30"/>
+			<voicemail>222</voicemail>
+			<balance-check>
+				<dtmf>150</dtmf>
+				<sms text="BA">150</sms>
+				<sms text="AL">150</sms>
+			</balance-check>
 			<apn value="general.t-mobile.uk">
 				<username>User</username>
 				<password>mms</password>
 				<dns>149.254.201.126</dns>
 				<dns>149.254.192.126</dns>
 			</apn>
+			<apn value="general.t-mobile.uk">
+				<dns>149.254.230.7</dns>
+				<dns>149.254.199.126</dns>
+			</apn>
 		</gsm>
 	</provider>
 	<provider>
@@ -1877,6 +2540,11 @@
 		<name>Vodafone</name>
 		<gsm>
 			<network-id mcc="234" mnc="15"/>
+			<voicemail>121</voicemail>
+			<balance-check>
+				<ussd>*#1345#</ussd>
+				<dtmf>2345</dtmf>
+			</balance-check>
 			<apn value="internet">
 				<name>Contract</name>
 				<username>web</username>
@@ -1891,8 +2559,10 @@
 				<dns>172.29.1.11</dns>
 				<dns>172.29.1.11</dns>
 			</apn>
-			<apn value="pp.internet">
+			<apn value="ppbundle.internet">
 				<name>TopUp and Go</name>
+				<username>web</username>
+				<password>web</password>
 			</apn>
 		</gsm>
 	</provider>
@@ -1905,6 +2575,8 @@
 			</apn>
 			<apn value="three.co.uk">
 				<name>Handsets</name>
+				<dns>172.30.139.17</dns>
+				<dns>172.30.140.69</dns>
 			</apn>
 		</gsm>
 	</provider>
@@ -1913,7 +2585,10 @@
 		<gsm>
 			<network-id mcc="234" mnc="33"/>
 			<network-id mcc="234" mnc="34"/>
-
+			<voicemail>123</voicemail>
+			<balance-check>
+				<dtmf>453</dtmf>
+			</balance-check>
 			<apn value="orangeinternet">
 				<name>Contract</name>
 				<username>orange</username>
@@ -1921,8 +2596,15 @@
 				<dns>193.35.133.10</dns>
 				<dns>193.35.134.10</dns>
 			</apn>
+			<apn value="internetvpn">
+				<name>Contract (with VPN)</name>
+				<username>orange</username>
+				<password>orange</password>
+				<dns>193.35.133.10</dns>
+				<dns>193.35.134.10</dns>
+			</apn>
 			<apn value="orangewap">
-				<name>Pay and Go</name>
+				<name>Orange WAP</name>
 				<username>orange</username>
 				<password>multimedia</password>
 				<dns>158.43.192.1</dns>
@@ -1946,6 +2628,22 @@
 	</provider>
 </country>
 
+<!-- Guernsey -->
+<country code="gg">
+	<provider>
+		<name>Sure (Cable & Wireless)</name>
+		<gsm>
+			<network-id mcc="234" mnc="55"/>
+			<apn value="wap">
+				<name>WAP</name>
+			</apn>
+			<apn value="internet">
+				<name>Internet</name>
+			</apn>
+		</gsm>
+	</provider>
+</country>
+
 <!-- Ghana -->
 <country code="gh">
 	<provider>
@@ -1974,6 +2672,7 @@
 	<provider>
 		<name>Zain</name>
 		<gsm>
+			<network-id mcc="620" mnc="06"/>
 			<apn value="internet"/>
 		</gsm>
 	</provider>
@@ -1989,16 +2688,19 @@
 		<name>Cosmote</name>
 		<gsm>
 			<network-id mcc="202" mnc="01"/>
-			<apn value="3g-internet">
-				<dns>195.167.65.194</dns>
-			</apn>
+			<apn value="internet"/>
 		</gsm>
 	</provider>
 	<provider>
 		<name>Vodafone</name>
 		<gsm>
 			<network-id mcc="202" mnc="05"/>
-			<apn value="internet"/>
+			<apn value="internet">
+				<name>Contract</name>
+			</apn>
+			<apn value="web.session">
+				<name>Mobile Broadband On Demand</name>
+			</apn>
 		</gsm>
 	</provider>
 	<provider>
@@ -2040,6 +2742,7 @@
 	<provider>
 		<name>GT&T Cellink Plus</name>
 		<gsm>
+			<network-id mcc="738" mnc="02"/>
 			<apn value="wap.cellinkgy.com">
 				<username>test</username>
 				<password>test</password>
@@ -2079,32 +2782,33 @@
 		</gsm>
 	</provider>
 	<provider>
-		<name>People</name>
+		<name>China Mobile</name>
 		<gsm>
 			<network-id mcc="454" mnc="12"/>
-			<apn value="internet"/>
+			<apn value="peoples.net"/>
 		</gsm>
 	</provider>
 	<provider>
 		<name>SmarTone</name>
 		<gsm>
 			<network-id mcc="454" mnc="06"/>
-			<apn value="internet">
-				<dns>202.140.96.51</dns>
-				<dns>202.140.96.52</dns>
-			</apn>
-		</gsm>
-	</provider>
-	<provider>
-		<name>Sunday</name>
-		<gsm>
 			<apn value="internet"/>
 		</gsm>
 	</provider>
 	<provider>
-		<name>Orange</name>
+		<name>PCCW (Sunday)</name>
 		<gsm>
-			<apn value="web.orangehk.com"/>
+			<network-id mcc="454" mnc="16"/>
+			<network-id mcc="454" mnc="19"/>
+			<apn value="internet">
+				<name>Sunday (Old)</name>
+			</apn>
+			<apn value="pccwdata">
+				<name>PCCW 2G/GPRS</name>
+			</apn>
+			<apn value="pccw">
+				<name>PCCW 3G</name>
+			</apn>
 		</gsm>
 	</provider>
 	<provider>
@@ -2134,7 +2838,7 @@
 		<name>T-Mobile</name>
 		<gsm>
 			<network-id mcc="219" mnc="01"/>
-			<apn value="web.htgpr">
+			<apn value="web.htgprs">
 				<dns>10.12.0.1</dns>
 			</apn>
 		</gsm>
@@ -2143,6 +2847,9 @@
 		<name>VIPNET</name>
 		<gsm>
 			<network-id mcc="219" mnc="10"/>
+			<apn value="data.vip.hr">
+				<name>Contract and Prepaid</name>
+			</apn>
 			<apn value="gprs5.vipnet.hr">
 				<name>GPRS 5</name>
 				<username>38591</username>
@@ -2155,7 +2862,7 @@
 				<password>38591</password>
 				<dns>195.29.159.15</dns>
 			</apn>
-			<apn value="3g.vipnet.hr">
+			<apn value="3g.vip.hr">
 				<name>3G</name>
 				<username>38591</username>
 				<password>38591</password>
@@ -2164,28 +2871,47 @@
 			</apn>
 		</gsm>
 	</provider>
+	<provider>
+		<name>CARNet VIPNET</name>
+		<gsm>
+			<network-id mcc="219" mnc="10"/>
+			<apn value="carnet.vip.hr">
+				<username>AAIEDU</username>
+				<password></password>
+			</apn>
+		</gsm>
+	</provider>
+	<provider>
+		<name>CARNet Tele2</name>
+		<gsm>
+			<network-id mcc="219" mnc="02"/>
+			<apn value="carnet.tele2.hr">
+				<username>AAIEDU</username>
+				<password></password>
+			</apn>
+		</gsm>
+	</provider>
+	<provider>
+		<name>Tele2</name>
+		<gsm>
+			<network-id mcc="219" mnc="02"/>
+			<apn value="mobileinternet.tele2.hr">
+				<dns>212.247.156.66</dns>
+			</apn>
+		</gsm>
+	</provider>
 </country>
 
 <!-- Hungary -->
 <country code="hu">
 	<provider>
-		<name>Pannon</name>
+		<name>Telenor</name>
 		<gsm>
 			<network-id mcc="216" mnc="01"/>
-			<apn value="netx">
-				<name>átalánydíjas</name>
-				<dns>193.225.155.254</dns>
-				<dns>194.149.0.157</dns>
-			</apn>
 			<apn value="net">
-				<name>Normál</name>
-				<dns>193.225.153.17</dns>
-				<dns>195.56.172.113</dns>
-			</apn>
-			<apn value="snet">
-				<name>Tömörített</name>
-				<dns>193.225.153.17</dns>
-				<dns>194.149.0.157</dns>
+				<name>mobilinternet</name>
+				<dns>217.79.128.40</dns>
+				<dns>217.79.128.45</dns>
 			</apn>
 		</gsm>
 	</provider>
@@ -2216,12 +2942,11 @@
 				<dns>80.244.97.30</dns>
 				<dns>80.244.96.1</dns>
 			</apn>
+			<!-- http://www.vodafone.hu/en/support/questions-answers/pay-monthly/internet -->
 			<apn value="internet.vodafone.net">
 				<name>Előf. töm.</name>
 				<username>vodawap</username>
 				<password>vodawap</password>
-				<dns>80.244.97.30</dns>
-				<dns>80.244.96.1</dns>
 			</apn>
 			<apn value="vitamax.snet.vodafone.net">
 				<name>Felt. norm.</name>
@@ -2230,8 +2955,15 @@
 			</apn>
 			<apn value="vitamax.internet.vodafone.net">
 				<name>Vodafone (felt. töm.)</name>
-				<dns>80.244.97.30</dns>
-				<dns>80.244.96.1</dns>
+			</apn>
+		</gsm>
+	</provider>
+	<provider>
+		<name>Invitel</name>
+                <!-- MVNO operating on Telenor's network -->
+		<gsm>
+			<apn value="invitel.mobilnet">
+				<name>net.and.go</name>
 			</apn>
 		</gsm>
 	</provider>
@@ -2240,54 +2972,92 @@
 <!-- Indonesia -->
 <country code="id">
 	<provider>
-		<name>AXIS</name>
+		<name>3</name>
 		<gsm>
-			<network-id mcc="510" mnc="08"/>
-			<apn value="AXIS">
-				<username>axis</username>
-				<password>123456</password>
+			<network-id mcc="510" mnc="89"/>
+			<apn value="3gprs">
+				<name>GPRS</name>
+				<username>3gprs</username>
+				<password>3gprs</password>
+			</apn>
+			<apn value="3data">
+				<name>Monthly Internet Service</name>
+				<name xml:lang="id">Layanan Internet Bulanan</name>
+				<username>3data</username>
+				<password>3data</password>
 			</apn>
 		</gsm>
 	</provider>
 	<provider>
-		<name>IM3</name>
+		<name>AXIS</name>
 		<gsm>
-			<network-id mcc="510" mnc="21"/>
-			<apn value="www.imdosat-m3.net">
-				<username>gprs</username>
-				<password>im3</password>
-				<dns>202.155.46.66</dns>
-				<dns>202.155.46.77</dns>
+			<network-id mcc="510" mnc="08"/>
+			<apn value="AXIS">
+				<username>axis</username>
+				<password>123456</password>
 			</apn>
 		</gsm>
 	</provider>
 	<provider>
 		<name>Indosat</name>
 		<gsm>
+			<network-id mcc="510" mnc="21"/>
 			<network-id mcc="510" mnc="01"/>
-			<apn value="satelindogprs.com">
-				<dns>202.152.162.250</dns>
+
+			<!-- http://www.indosat.com/Customer_Support/Customer_Support/Setting_GPRS_MMS_WAP_dan_BroadBand -->
+			<!-- http://3g.indosat.com/about/FAQ.php -->
+			<!-- http://www.indosat.com/Mentari/Mentari_Update/Voucher_Internet_Indosat -->
+			<!-- It seems that the APN is pretty much the same for plans -->
+
+			<apn value="indosatgprs">
+				<name>IM3/Mentari Time-based</name>
+				<username>indosat at durasi</username>
+				<password>indosat at durasi</password>
 			</apn>
 			<apn value="indosatgprs">
-				<name>Matrix 3G</name>
+				<name>IM3/Mentari Volume-based</name>
+				<username>indosat</username>
+				<password>indosat</password>
+			</apn>
+			<apn value="indosatgprs">
+				<name>Matrix 3G/3.5G</name>
 				<username>indosat</username>
 				<password>indosat</password>
-				<dns>202.155.46.66</dns>
-				<dns>202.155.46.77</dns>
 			</apn>
 		</gsm>
+		<cdma>
+			<name>StarOne</name>
+			<username>starone</username>
+			<password>indosat</password>
+			<sid value="10817"/>
+			<sid value="10819"/>
+		</cdma>
 	</provider>
 	<provider>
 		<name>Telkomsel</name>
 		<gsm>
 			<network-id mcc="510" mnc="10"/>
 			<network-id mcc="510" mnc="20"/>
-			<apn value="internet">
+
+			<!-- http://www.telkomsel.com/customer-service/manual-setting/ -->
+			<apn value="telkomsel">
 				<username>wap</username>
 				<password>wap123</password>
 				<dns>202.152.0.2</dns>
 				<dns>202.155.14.251</dns>
 			</apn>
+
+			<!-- http://www.telkomsel.com/telkomselflash/telkomsel-flash -->
+			<apn value="flash">
+				<name>Flash Time-based</name>
+				<username>foo</username>
+				<password>bar</password>
+			</apn>
+			<apn value="internet">
+				<name>Flash Volume-based</name>
+				<username>foo</username>
+				<password>bar</password>
+			</apn>
 		</gsm>
 	</provider>
 	<provider>
@@ -2302,14 +3072,54 @@
 			</apn>
 		</gsm>
 	</provider>
+	<provider>
+		<name>SMART</name>
+		<cdma>
+			<username>smart</username>
+			<password>smart</password>
+			<sid value="10608"/>
+		</cdma>
+	</provider>
+	<provider>
+		<name>Ceria</name>
+		<cdma>
+			<username>internet</username>
+			<password>ceria</password>
+		</cdma>
+	</provider>
+	<provider>
+		<name>Fren</name>
+		<cdma>
+			<username>m8</username>
+			<password>m8</password>
+			<sid value="10530"/>
+		</cdma>
+	</provider>
+	<provider>
+		<name>Telkom Flexy</name>
+		<cdma>
+			<username>telkomnet at flexi</username>
+			<password>telkom</password>
+			<sid value="10496"/>
+		</cdma>
+	</provider>
+	<provider>
+		<name>Esia</name>
+		<cdma>
+			<sid value="10623"/>
+		</cdma>
+	</provider>
 </country>
 
 <!-- Ireland -->
 <country code="ie">
 	<provider>
-		<name>o2</name>
+		<name>O2</name>
 		<gsm>
 			<network-id mcc="272" mnc="02"/>
+			<balance-check>
+				<ussd>*#100#</ussd>
+			</balance-check>
 			<apn value="open.internet">
 				<name>Contract</name>
 				<username>gprs</username>
@@ -2351,10 +3161,14 @@
 		<name>Meteor</name>
 		<gsm>
 			<network-id mcc="272" mnc="03"/>
-			<apn value="isp.mymeteor.ie">
+			<apn value="data.mymeteor.ie">
+				<name>Meteor Data</name>
 				<username>my</username>
 				<password>meteor</password>
 			</apn>
+			<apn value="broadband.mymeteor.ie">
+				<name>Broadband To Go</name>
+			</apn>
 		</gsm>
 	</provider>
 	<provider>
@@ -2382,7 +3196,8 @@
 		<name>Orange</name>
 		<gsm>
 			<network-id mcc="425" mnc="01"/>
-			<apn value="orangeinternet">
+			<apn value="uinternet">
+				<name>3G Internet</name>
 				<dns>158.43.192.1</dns>
 				<dns>158.43.128.1</dns>
 			</apn>
@@ -2392,7 +3207,7 @@
 		<name>Pelephone</name>
 		<gsm>
 			<network-id mcc="425" mnc="03"/>
-			<apn value="internet.pelephone.net.il ">
+			<apn value="internet.pelephone.net.il">
 				<name>3G</name>
 				<username>pcl at 3g</username>
 				<password>pcl</password>
@@ -2401,9 +3216,60 @@
 	</provider>
 </country>
 
+<!-- Isle of Man -->
+<country code="im">
+	<provider>
+		<name>Sure (Cable & Wireless)</name>
+		<gsm>
+			<network-id mcc="234" mnc="55"/>
+			<apn value="wap">
+				<name>WAP</name>
+			</apn>
+			<apn value="internet">
+				<name>Internet</name>
+			</apn>
+		</gsm>
+	</provider>
+</country>
+
 <!-- India -->
 <country code="in">
 	<provider>
+		<name>AIRCEL</name>
+		<gsm>
+			<network-id mcc="404" mnc="17"/>
+			<network-id mcc="404" mnc="28"/>
+			<network-id mcc="404" mnc="29"/>
+			<network-id mcc="404" mnc="37"/>
+			<network-id mcc="404" mnc="41"/>
+			<network-id mcc="404" mnc="42"/>
+			<network-id mcc="404" mnc="91"/>
+			<network-id mcc="405" mnc="800"/>
+			<network-id mcc="405" mnc="801"/>
+			<network-id mcc="405" mnc="802"/>
+			<network-id mcc="405" mnc="803"/>
+			<network-id mcc="405" mnc="804"/>
+			<network-id mcc="405" mnc="805"/>
+			<network-id mcc="405" mnc="806"/>
+			<network-id mcc="405" mnc="807"/>
+			<network-id mcc="405" mnc="808"/>
+			<network-id mcc="405" mnc="809"/>
+			<network-id mcc="405" mnc="810"/>
+			<network-id mcc="405" mnc="811"/>
+			<network-id mcc="405" mnc="812"/>
+
+			<apn value="aircelweb">
+				<name>Web</name>
+			</apn>
+			<apn value="aircelgprs.po">
+				<name>GPRS (Postpaid)</name>
+			</apn>
+			<apn value="aircelgprs.pr">
+				<name>GPRS (Prepaid)</name>
+			</apn>
+		</gsm>
+	</provider>
+	<provider>
 		<name>Airtel</name>
 		<gsm>
 			<network-id mcc="404" mnc="02"/>
@@ -2420,14 +3286,15 @@
 			<network-id mcc="404" mnc="49"/>
 			<network-id mcc="404" mnc="70"/>
 			<network-id mcc="404" mnc="90"/>
-			<network-id mcc="404" mnc="91"/>
-			<network-id mcc="404" mnc="94"/>
-			<network-id mcc="404" mnc="95"/>
+			<network-id mcc="404" mnc="92"/>
+			<network-id mcc="404" mnc="93"/>
 			<network-id mcc="404" mnc="96"/>
 			<network-id mcc="404" mnc="97"/>
 			<network-id mcc="404" mnc="98"/>
 			<network-id mcc="405" mnc="51"/>
 			<network-id mcc="405" mnc="52"/>
+			<network-id mcc="405" mnc="54"/>
+			<network-id mcc="405" mnc="56"/>
 
 			<apn value="airtelgprs.com">
 				<dns>202.56.230.5</dns>
@@ -2442,20 +3309,34 @@
 			<network-id mcc="404" mnc="05"/>
 			<network-id mcc="404" mnc="11"/>
 			<network-id mcc="404" mnc="13"/>
+			<network-id mcc="404" mnc="15"/>
 			<network-id mcc="404" mnc="20"/>
 			<network-id mcc="404" mnc="27"/>
 			<network-id mcc="404" mnc="30"/>
+			<network-id mcc="404" mnc="43"/>
 			<network-id mcc="404" mnc="46"/>
-			<network-id mcc="404" mnc="67"/>
+			<network-id mcc="404" mnc="60"/>
 			<network-id mcc="404" mnc="84"/>
 			<network-id mcc="404" mnc="86"/>
+			<network-id mcc="404" mnc="88"/>
+			<network-id mcc="405" mnc="66"/>
+			<network-id mcc="405" mnc="750"/>
+			<network-id mcc="405" mnc="751"/>
 			<network-id mcc="405" mnc="752"/>
 			<network-id mcc="405" mnc="753"/>
-			<apn value="www"/>
+			<network-id mcc="405" mnc="754"/>
+			<network-id mcc="405" mnc="755"/>
+			<network-id mcc="405" mnc="756"/>
+			<apn value="www">
+				<name>Vodafone Connect</name>
+			</apn>
+			<apn value="portalnmms">
+				<name>Vodafone Live</name>
+			</apn>
 		</gsm>
 	</provider>
 	<provider>
-		<name>BSNL</name>
+		<name>BSNL/CellOne</name>
 		<gsm>
 			<network-id mcc="404" mnc="34"/>
 			<network-id mcc="404" mnc="38"/>
@@ -2479,20 +3360,34 @@
 			<network-id mcc="404" mnc="80"/>
 			<network-id mcc="404" mnc="81"/>
 
+			<!-- http://cellone.in/cellone_msp.htm -->
+			<apn value="bsnlnet">
+				<name>New GPRS/3G</name>
+			</apn>
+
+			<apn value="bsnlwap">
+				<name>New WAP</name>
+			</apn>
+
 			<apn value="bsnlsouth">
-				<name>South A</name>
+				<name>Old South Zone A (Karnatka, Andhra Pradesh, Chennai, Tamil Nadu, Kerala)</name>
 			</apn>
 			<apn value="gprssouth.cellone.in">
-				<name>South B</name>
+				<name>Old South Zone B (Karnatka, Andhra Pradesh, Chennai, Tamil Nadu, Kerala)</name>
 			</apn>
 			<apn value="gprsnorth.cellone.in">
-				<name>North</name>
+				<name>Old North Zone (Haryana, Punjab, UP(East), UP(West), Himachal Pradesh, Rajasthan, Jammu & Kashmir)</name>
 			</apn>
 			<apn value="gprswest.cellone.in">
-				<name>West</name>
+				<name>Old West Zone (Maharashtra, Gujrat, Madhya Pradesh, Chattishgarh)</name>
 			</apn>
 			<apn value="www.e.pr">
-				<name>East</name>
+				<name>Old East Zone Prepaid (Jharkhand, Bihar, Kolkata, West Bengal, Orissa, Assam, North East, Adman Nicobar)</name>
+				<dns>218.248.240.208</dns>
+				<dns>218.248.240.135</dns>
+			</apn>
+			<apn value="www.e.po">
+				<name>Old East Zone Postpaid (Jharkhand, Bihar, Kolkata, West Bengal, Orissa, Assam, North East, Adman Nicobar)</name>
 				<dns>218.248.240.208</dns>
 				<dns>218.248.240.135</dns>
 			</apn>
@@ -2502,11 +3397,19 @@
 		<name>Idea Cellular</name>
 		<gsm>
 			<network-id mcc="404" mnc="04"/>
+			<network-id mcc="404" mnc="07"/>
 			<network-id mcc="404" mnc="12"/>
+			<network-id mcc="404" mnc="14"/>
+			<network-id mcc="404" mnc="19"/>
 			<network-id mcc="404" mnc="22"/>
 			<network-id mcc="404" mnc="24"/>
+			<network-id mcc="404" mnc="44"/>
 			<network-id mcc="404" mnc="56"/>
 			<network-id mcc="404" mnc="82"/>
+			<network-id mcc="405" mnc="70"/>
+			<network-id mcc="405" mnc="799"/>
+			<network-id mcc="405" mnc="845"/>
+			<network-id mcc="405" mnc="848"/>
 			<network-id mcc="405" mnc="850"/>
 			<apn value="internet">
 				<dns>10.4.42.15</dns>
@@ -2536,8 +3439,47 @@
 		</gsm>
 	</provider>
 	<provider>
-		<name>Reliance Netconnect</name>
-		<cdma/>
+		<name>Reliance</name>
+		<gsm>
+			<network-id mcc="404" mnc="09"/>
+			<network-id mcc="404" mnc="36"/>
+			<network-id mcc="404" mnc="52"/>
+			<network-id mcc="404" mnc="83"/>
+			<network-id mcc="404" mnc="85"/>
+			<network-id mcc="405" mnc="05"/>
+			<network-id mcc="405" mnc="10"/>
+			<network-id mcc="405" mnc="13"/>
+			<apn value="smartnet">
+				<name>Smart Net</name>
+			</apn>
+			<apn value="smartwap">
+				<name>Smart WAP</name>
+			</apn>
+		</gsm>
+		<cdma>
+			<name>Reliance Netconnect</name>
+			<sid value="14655"/>
+			<sid value="14656"/>
+			<sid value="14657"/>
+			<sid value="14658"/>
+			<sid value="14659"/>
+			<sid value="14660"/>
+			<sid value="14661"/>
+			<sid value="14662"/>
+			<sid value="14663"/>
+			<sid value="14664"/>
+			<sid value="14665"/>
+			<sid value="14666"/>
+			<sid value="14667"/>
+			<sid value="14668"/>
+			<sid value="14669"/>
+			<sid value="14670"/>
+			<sid value="14671"/>
+			<sid value="14672"/>
+			<sid value="14673"/>
+			<sid value="14674"/>
+			<sid value="14675"/>
+		</cdma>
 	</provider>
 	<provider>
 		<name>Spice telecom</name>
@@ -2555,6 +3497,35 @@
 		</gsm>
 	</provider>
 	<provider>
+		<name>Tata Docomo</name>
+		<gsm>
+			<network-id mcc="405" mnc="025"/>
+			<network-id mcc="405" mnc="026"/>
+			<network-id mcc="405" mnc="027"/>
+			<network-id mcc="405" mnc="029"/>
+			<network-id mcc="405" mnc="030"/>
+			<network-id mcc="405" mnc="031"/>
+			<network-id mcc="405" mnc="032"/>
+			<network-id mcc="405" mnc="034"/>
+			<network-id mcc="405" mnc="035"/>
+			<network-id mcc="405" mnc="036"/>
+			<network-id mcc="405" mnc="037"/>
+			<network-id mcc="405" mnc="038"/>
+			<network-id mcc="405" mnc="039"/>
+			<network-id mcc="405" mnc="041"/>
+			<network-id mcc="405" mnc="042"/>
+			<network-id mcc="405" mnc="043"/>
+			<network-id mcc="405" mnc="044"/>
+			<network-id mcc="405" mnc="045"/>
+			<network-id mcc="405" mnc="046"/>
+			<network-id mcc="405" mnc="047"/>
+
+			<apn value="TATA.DOCOMO.INTERNET">
+				<name>Internet</name>
+			</apn>
+		</gsm>
+	</provider>
+	<provider>
 		<name>Tata Indicom (Plug2Surf)</name>
 		<cdma>
 			<username>internet</username>
@@ -2568,6 +3539,77 @@
 			<password>internet</password>
 		</cdma>
 	</provider>
+	<provider>
+		<name>MTS MBlaze</name>
+		<cdma>
+			<username>internet at internet.mtsindia.in</username>
+			<password>mts</password>
+			<sid value="14554"/>
+		</cdma>
+	</provider>
+</country>
+
+<!-- Iraq -->
+<country code="iq">
+	<provider>
+		<name>Itisaluna</name>
+		<cdma>
+			<username>itisaluna</username>
+			<password>itisaluna</password>
+			<sid value="15456"/>
+		</cdma>
+	</provider>
+	<provider>
+		<name>Omnea Telecom</name>
+		<cdma>
+			<username>omnea</username>
+			<password>omnea</password>
+		</cdma>
+	</provider>
+	<provider>
+		<name>Kalimat Telecom</name>
+		<cdma>
+			<sid value="15470"/>
+		</cdma>
+	</provider>
+	<provider>
+		<name>Korek</name>
+		<gsm>
+			<network-id mcc="418" mnc="40"/>
+			<apn value="net.korek.com">
+				<username>korek</username>
+				<password>korek</password>
+			</apn>
+		</gsm>
+	</provider>
+	<provider>
+		<name>Asia Cell</name>
+		<gsm>
+			<network-id mcc="418" mnc="50"/>
+			<apn value="net.asiacell.com">
+			</apn>
+		</gsm>
+	</provider>
+</country>
+
+<!-- Iran -->
+<country code="ir">
+	<provider>
+		<name>همراه اول</name>
+		<gsm>
+			<network-id mcc="432" mnc="11"/>
+			<apn value="mcinet">
+			</apn>
+		</gsm>
+	</provider>
+	<provider>
+		<name>ایرانسل</name>
+		<gsm>
+			<network-id mcc="432" mnc="35"/>
+			<apn value="mtnirancell">
+			</apn>
+		</gsm>
+	</provider>
 </country>
 
 <!-- Iceland -->
@@ -2577,10 +3619,7 @@
 		<gsm>
 			<network-id mcc="274" mnc="02"/>
 			<network-id mcc="274" mnc="03"/>
-			<apn value="vmc.gprs.is">
-				<dns>213.176.128.51</dns>
-				<dns>213.176.128.50</dns>
-			</apn>
+			<apn value="vmc.gprs.is"/>
 		</gsm>
 	</provider>
 	<provider>
@@ -2593,6 +3632,16 @@
 			</apn>
 		</gsm>
 	</provider>
+	<provider>
+		<name>Síminn</name>
+		<gsm>
+			<network-id mcc="274" mnc="01"/>
+			<apn value="wap.simi.is">
+				<dns>194.105.224.1</dns>
+				<dns>212.30.200.200</dns>
+			</apn>
+		</gsm>
+	</provider>
 </country>
 
 <!-- Italy -->
@@ -2601,7 +3650,14 @@
 		<name>Vodafone</name>
 		<gsm>
 			<network-id mcc="222" mnc="10"/>
-			<apn value="web.omnitel.it"/>
+			<apn value="mobile.vodafone.it">
+				<name>Mobile Internet</name>
+			</apn>
+			<apn value="web.omnitel.it">
+				<name>Internet Facile (old)</name>
+				<dns>83.224.70.62</dns>
+				<dns>83.224.70.78</dns>
+			</apn>
 		</gsm>
 	</provider>
 	<provider>
@@ -2609,7 +3665,9 @@
 		<gsm>
 			<network-id mcc="222" mnc="01"/>
 			<apn value="ibox.tim.it">
-				<name>ibox</name>
+				<name>Maxxi Alice/Internet</name>
+				<dns>217.200.200.42</dns>
+				<dns>213.230.129.10</dns>
 			</apn>
 			<apn value="wap.tim.it">
 				<name>WAP</name>
@@ -2627,11 +3685,15 @@
 				<name>Non-business</name>
 				<username>Wind</username>
 				<password>Wind</password>
+				<dns>193.70.152.25</dns>
+				<dns>193.70.192.25</dns>
 			</apn>
 			<apn value="internet.wind.biz">
 				<name>Business</name>
 				<username>Wind</username>
 				<password>Wind</password>
+				<dns>193.70.152.25</dns>
+				<dns>193.70.192.25</dns>
 			</apn>
 		</gsm>
 	</provider>
@@ -2641,6 +3703,8 @@
 			<network-id mcc="222" mnc="99"/>
 			<apn value="tre.it">
 				<name>Ricaricabile</name>
+				<dns>62.13.169.92</dns>
+				<dns>62.13.169.93</dns>
 			</apn>
 			<apn value="datacard.tre.it">
 				<name>Abbonamento</name>
@@ -2650,11 +3714,58 @@
 	<provider>
 		<name>Fastweb</name>
 		<gsm>
+			<network-id mcc="222" mnc="99"/>
 			<apn value="apn.fastweb.it">
 				<name>Voce/dati</name>
 			</apn>
 			<apn value="datacard.fastweb.it">
 				<name>Solo dati</name>
+				<dns>213.140.2.43</dns>
+				<dns>213.140.2.49</dns>
+			</apn>
+		</gsm>
+	</provider>
+	<provider>
+		<name>PosteMobile</name>
+		<gsm>
+			<network-id mcc="222" mnc="10"/>
+			<apn value="internet.postemobile.it"/>
+		</gsm>
+	</provider>
+	<provider>
+		<name>CoopVoce</name>
+		<gsm>
+			<network-id mcc="222" mnc="01"/>
+			<apn value="web.coopvoce.it">
+				<name>Internet Mobile</name>
+			</apn>
+		</gsm>
+	</provider>
+</country>
+
+<!-- Jersey -->
+<country code="je">
+	<provider>
+		<name>Sure (Cable & Wireless)</name>
+		<gsm>
+			<network-id mcc="234" mnc="55"/>
+			<apn value="wap">
+				<name>WAP</name>
+			</apn>
+			<apn value="internet">
+				<name>Internet</name>
+			</apn>
+		</gsm>
+	</provider>
+	<provider>
+		<name>Jersey Telecom</name>
+		<gsm>
+			<network-id mcc="234" mnc="50"/>
+			<apn value="pepper">
+				<username>abc</username>
+				<password>abc</password>
+				<dns>212.9.0.135</dns>
+				<dns>212.9.0.136</dns>
 			</apn>
 		</gsm>
 	</provider>
@@ -2715,6 +3826,17 @@
 		</gsm>
 	</provider>
 	<provider>
+		<name>b-mobile</name>
+		<gsm>
+			<network-id mcc="440" mnc="10"/>
+			<apn value="dm.jplat.net">
+				<name>u300</name>
+				<username>bmobile at u300</username>
+				<password>bmobile</password>
+			</apn>
+		</gsm>
+	</provider>
+	<provider>
 		<name>e-mobile</name>
 		<gsm>
 			<network-id mcc="440" mnc="00"/>
@@ -2814,11 +3936,69 @@
 		</gsm>
 	</provider>
 	<provider>
-		<name>Econet</name>
+		<name>yu (Econet)</name>
 		<gsm>
+			<network-id mcc="639" mnc="05"/>
 			<apn value="internet.econet.co.ke"/>
 		</gsm>
 	</provider>
+	<provider>
+		<name>Orange</name>
+		<gsm>
+			<network-id mcc="639" mnc="07"/>
+			<apn value="bew.orange.co.ke"/>
+		</gsm>
+		<cdma>
+			<name>Orange Fixed Plus</name>
+		</cdma>
+	</provider>
+</country>
+
+<!-- Cambodia -->
+<country code="kh">
+	<provider>
+		<name>hello</name>
+		<gsm>
+			<network-id mcc="456" mnc="02"/>
+			<apn value="hellowww"/>
+		</gsm>
+	</provider>
+	<provider>
+		<name>Mobitel</name>
+		<gsm>
+			<network-id mcc="456" mnc="01"/>
+			<apn value="3g">
+				<name>CellCard Corporate</name>
+				<username>mobitel</username>
+				<password>mobitel</password>
+			</apn>
+			<apn value="3gtv">
+				<name>CellCard Unlimited</name>
+				<username>mobitel</username>
+				<password>mobitel</password>
+			</apn>
+		</gsm>
+	</provider>
+	<provider>
+		<name>qb</name>
+		<gsm>
+			<network-id mcc="456" mnc="04"/>
+			<apn value="WAP">
+				<name>QBmore</name>
+			</apn>
+		</gsm>
+	</provider>
+	<provider>
+		<name>Star-Cell</name>
+		<gsm>
+			<network-id mcc="456" mnc="05"/>
+			<apn value="internet"/>
+		</gsm>
+	</provider>
+	<provider>
+		<name>Excell</name>
+		<cdma/>
+	</provider>
 </country>
 
 <!-- Korea, Republic of -->
@@ -2989,6 +4169,12 @@
 			<apn value="ppinternet">
 				<name>Prepaid</name>
 			</apn>
+			<apn value="dialogbb">
+				<name>Unlimited Broadband</name>
+			</apn>
+			<apn value="kitbb.com">
+				<name>Prepaid (Kitbb)</name>
+			</apn>
 		</gsm>
 	</provider>
 	<provider>
@@ -3060,7 +4246,7 @@
 		<name>LUXGSM</name>
 		<gsm>
 			<network-id mcc="270" mnc="01"/>
-			<apn value="webp.pt.lu">
+			<apn value="web.pt.lu">
 				<dns>194.154.192.101</dns>
 				<dns>194.154.192.102</dns>
 			</apn>
@@ -3070,9 +4256,27 @@
 		<name>Tango</name>
 		<gsm>
 			<network-id mcc="270" mnc="77"/>
+			<apn value="hspa">
+				<name>hspa</name>
+				<username>tango</username>
+				<password>tango</password>
+			</apn>
 			<apn value="internet">
+				<name>internet</name>
 				<username>tango</username>
 				<password>tango</password>
+				<dns>212.66.70.3</dns>
+				<dns>212.66.75.7</dns>
+			</apn>
+		</gsm>
+	</provider>
+	<provider>
+		<name>Orange</name>
+		<gsm>
+			<network-id mcc="270" mnc="99"/>
+			<apn value="orange.lu">
+				<dns>85.94.224.1</dns>
+				<dns>85.94.224.2</dns>
 			</apn>
 		</gsm>
 	</provider>
@@ -3095,6 +4299,12 @@
 				<dns>212.93.96.2</dns>
 				<dns>212.93.96.4</dns>
 			</apn>
+			<apn value="open.lmt.lv">
+				<name>O!Karte internet</name>
+			</apn>
+			<apn value="okarte.lmt.lv">
+				<name>O!Karte</name>
+			</apn>
 		</gsm>
 	</provider>
 	<provider>
@@ -3102,9 +4312,32 @@
 		<gsm>
 			<network-id mcc="247" mnc="02"/>
 			<apn value="internet.tele2.lv">
+				<name>Regular</name>
 				<username>gprs</username>
 				<password>internet</password>
 			</apn>
+			<apn value="mobileinternet.tele2.lv">
+				<name>Mobile Internet</name>
+				<username>wap</username>
+				<password>wap</password>
+			</apn>
+			<apn value="data.tele2.lv">
+				<name>Zelta Zivtina</name>
+				<username>wap</username>
+				<password>wap</password>
+			</apn>
+		</gsm>
+	</provider>
+	<provider>
+		<name>Bite</name>
+		<gsm>
+			<network-id mcc="247" mnc="05"/>
+			<apn value="wap">
+				<name>Bite plus</name>
+			</apn>
+			<apn value="internet">
+				<name>Prepaid/Contract</name>
+			</apn>
 		</gsm>
 	</provider>
 </country>
@@ -3179,7 +4412,22 @@
 		<name>T-Mobile</name>
 		<gsm>
 			<network-id mcc="297" mnc="02"/>
-			<apn value="internet-postpaid"/>
+			<apn value="tcmg-data">
+				<name>Mobile Broadband</name>
+				<username>38267</username>
+				<password>38267</password>
+			</apn>
+			<apn value="tcmg-nw">
+				<name>GPRS</name>
+				<username>38267</username>
+				<password>38267</password>
+			</apn>
+			<apn value="internet-postpaid">
+				<name>Postpaid (old)</name>
+			</apn>
+			<apn value="internet-prepaid">
+				<name>Prepaid (old)</name>
+			</apn>
 		</gsm>
 	</provider>
 	<provider>
@@ -3243,6 +4491,20 @@
 	</provider>
 </country>
 
+<!-- Macedonia -->
+<country code="mk">
+	<provider>
+		<name>Vodafone</name>
+		<gsm>
+			<network-id mcc="294" mnc="03"/>
+			<apn value="vipoperator">
+				<username>vipoperator</username>
+				<password>vipoperator</password>
+			</apn>
+		</gsm>
+	</provider>
+</country>
+
 <!-- Malta -->
 <country code="mt">
 	<provider>
@@ -3298,6 +4560,17 @@
 	</provider>
 </country>
 
+<!-- Malawi -->
+<country code="mw">
+	<provider>
+		<name>TNM</name>
+		<gsm>
+			<network-id mcc="650" mnc="01"/>
+			<apn value="Internet"/>
+		</gsm>
+	</provider>
+</country>
+
 <!-- Mexico -->
 <country code="mx">
 	<provider>
@@ -3307,7 +4580,6 @@
 			<apn value="internet.itelcel.com">
 				<username>webgprs</username>
 				<password>webgprs2002</password>
-				<dns>148.233.151.245</dns>
 			</apn>
 		</gsm>
 	</provider>
@@ -3334,9 +4606,13 @@
 		<gsm>
 			<network-id mcc="502" mnc="16"/>
 			<apn value="diginet">
+				<name>Mobile Internet</name>
 				<dns>203.92.128.131</dns>
 				<dns>203.92.128.132</dns>
 			</apn>
+			<apn value="3gdgnet">
+				<name>Broadband</name>
+			</apn>
 		</gsm>
 	</provider>
 	<provider>
@@ -3368,7 +4644,14 @@
 		<gsm>
 			<network-id mcc="502" mnc="13"/>
 			<network-id mcc="502" mnc="19"/>
-			<apn value="celcom.net.my"/>
+			<!-- http://www.channelx.com.my/mdp/gprs/internet_config.jsp?model_name=motorola_e398 -->
+			<apn value="celcom.net.my">
+				<name>GPRS</name>
+			</apn>
+			<!-- http://www.channelx.com.my/mdp/3g/wap_config_3g.jsp?model_name=huwei_u600_3g -->
+			<apn value="celcom3g">
+				<name>Celcom 3G</name>
+			</apn>
 		</gsm>
 	</provider>
 </country>
@@ -3391,7 +4674,9 @@
 		<name>Vodacom</name>
 		<gsm>
 			<network-id mcc="643" mnc="04"/>
-			<apn value="internet"/>
+			<apn value="internet">
+				<name>Contract / Prepaid</name>
+			</apn>
 		</gsm>
 	</provider>
 </country>
@@ -3402,6 +4687,7 @@
 		<name>Zain</name>
 		<gsm>
 			<network-id mcc="621" mnc="20"/>
+			<network-id mcc="621" mnc="80"/>
 			<apn value="wap">
 				<username>web</username>
 				<password>web</password>
@@ -3412,6 +4698,7 @@
 		<name>MTN</name>
 		<gsm>
 			<network-id mcc="621" mnc="30"/>
+			<network-id mcc="621" mnc="60"/>
 			<apn value="web.gprs.mtnnigeria.net">
 				<username>web</username>
 				<password>web</password>
@@ -3419,13 +4706,29 @@
 		</gsm>
 	</provider>
 	<provider>
-		<name>Glo-Ng</name>
+		<name>Glo Mobile</name>
 		<gsm>
 			<network-id mcc="621" mnc="50"/>
+			<network-id mcc="621" mnc="70"/>
 			<apn value="glosecure">
+				<name>Pay as You Go</name>
 				<username>gprs</username>
 				<password>gprs</password>
 			</apn>
+			<apn value="gloflat">
+				<name>Glo 3G Packs</name>
+				<username>flat</username>
+				<password>flat</password>
+			</apn>
+		</gsm>
+	</provider>
+	<provider>
+		<name>Etisalat</name>
+		<gsm>
+			<network-id mcc="621" mnc="90"/>
+			<apn value="etisalat">
+				<name>Etisalat Internet</name>
+			</apn>
 		</gsm>
 	</provider>
 </country>
@@ -3437,10 +4740,26 @@
 		<gsm>
 			<network-id mcc="710" mnc="21"/>
 			<network-id mcc="710" mnc="73"/>
+			<apn value="wap.emovil">
+				<name>WAP</name>
+				<username>wapemovil</username>
+				<password>wapemovil</password>
+			</apn>
+			<apn value="web.emovil">
+				<name>Web</name>
+				<username>webemovil</username>
+				<password>webemovil</password>
+			</apn>
 			<apn value="internet.ideasalo.ni">
+				<name>Web (Alo pcs)</name>
 				<username>internet</username>
 				<password>internet</password>
 			</apn>
+			<apn value="wap.ideasalo.ni">
+				<name>WAP (Alo pcs)</name>
+				<username>wap</username>
+				<password>wap</password>
+			</apn>
 		</gsm>
 	</provider>
 	<provider>
@@ -3460,6 +4779,7 @@
 	<provider>
 		<name>Hi</name>
 		<gsm>
+			<network-id mcc="204" mnc="08"/>
 			<apn value="portalmmm.nl"/>
 		</gsm>
 	</provider>
@@ -3467,12 +4787,18 @@
 		<name>KPN Mobile</name>
 		<gsm>
 			<network-id mcc="204" mnc="08"/>
+			<apn value="prepaidinternet" />
+			<apn value="fastinternet" />
 			<apn value="internet">
 				<username>KPN</username>
 				<password>gprs</password>
 				<dns>62.133.126.28</dns>
 				<dns>62.133.126.29</dns>
 			</apn>
+			<apn value="noapn">
+				<dns>62.133.126.28</dns>
+				<dns>62.133.126.29</dns>
+			</apn>
 		</gsm>
 	</provider>
 	<provider>
@@ -3514,10 +4840,20 @@
 			</apn>
 		</gsm>
 	</provider>
+		<provider>
+		<name>Tele2</name>
+		<gsm>
+			<network-id mcc="204" mnc="02"/>
+			<apn value="data.tele2.nl"/>
+		</gsm>
+	</provider>
 	<provider>
 		<name>XS4ALL Mobiel Internet</name>
 		<gsm>
-			<apn value="umts.xs4all.nl"/>
+			<apn value="umts.xs4all.nl">
+				<username>xs4all</username>
+				<password>xs4all</password>
+			</apn>
 		</gsm>
 	</provider>
 	<provider>
@@ -3528,6 +4864,8 @@
 				<name>Non-business</name>
 				<username>vodafone</username>
 				<password>vodafone</password>
+				<dns>62.140.138.237</dns>
+				<dns>62.140.140.250</dns>
 			</apn>
 			<apn value="office.vodafone.nl">
 				<name>Business</name>
@@ -3564,7 +4902,11 @@
 		<name>Telenor</name>
 		<gsm>
 			<network-id mcc="242" mnc="01"/>
-			<apn value="internet">
+			<balance-check>
+				<dtmf>220</dtmf>
+				<sms text="saldo">222</sms>
+			</balance-check>
+			<apn value="telenor">
 				<dns>212.17.131.3</dns>
 				<dns>148.122.161.2</dns>
 			</apn>
@@ -3573,6 +4915,7 @@
 	<provider>
 		<name>TDC</name>
 		<gsm>
+			<network-id mcc="242" mnc="08"/>
 			<apn value="internet.no">
 				<dns>80.232.41.10</dns>
 				<dns>80.232.41.20</dns>
@@ -3589,6 +4932,7 @@
 	<provider>
 		<name>OneCall</name>
 		<gsm>
+			<network-id mcc="242" mnc="05"/>
 			<apn value="internet"/>
 		</gsm>
 	</provider>
@@ -3613,9 +4957,24 @@
 	<provider>
 		<name>Telipol</name>
 		<gsm>
+			<network-id mcc="242" mnc="05"/>
 			<apn value="internet"/>
 		</gsm>
 	</provider>
+	<provider>
+		<name>Ventelo</name>
+		<gsm>
+			<network-id mcc="242" mnc="07"/>
+			<apn value="internet.ventelo.no"/>
+		</gsm>
+	</provider>
+	<provider>
+		<name>Ludo Mobil</name>
+		<gsm>
+			<network-id mcc="242" mnc="07"/>
+			<apn value="internet.ventelo.no"/>
+		</gsm>
+	</provider>
 </country>
 
 <!-- Nepal -->
@@ -3663,18 +5022,16 @@
 			<network-id mcc="530" mnc="01"/>
 			<apn value="live.vodafone.com">
 				<name>WAP</name>
-				<dns>202.20.93.10</dns>
-				<dns>203.97.191.189</dns>
+				<dns>202.73.206.16</dns>
+				<dns>202.73.198.16</dns>
 			</apn>
 			<apn value="www.vodafone.net.nz">
-				<name>Restricted</name>
-				<dns>202.20.93.10</dns>
-				<dns>203.97.191.189</dns>
+				<name>Contract / Prepaid (Restricted)</name>
 			</apn>
 			<apn value="internet">
 				<name>Unrestricted (public)</name>
-				<dns>202.20.93.10</dns>
-				<dns>203.97.191.189</dns>
+				<dns>202.73.206.16</dns>
+				<dns>202.73.198.16</dns>
 			</apn>
 		</gsm>
 	</provider>
@@ -3746,6 +5103,17 @@
 	</provider>
 </country>
 
+<!-- French Polynesia -->
+<country code="pf">
+	<provider>
+		<name>Vini</name>
+		<gsm>
+			<network-id mcc="547" mnc="20"/>
+			<apn value="internet"/>
+		</gsm>
+	</provider>
+</country>
+
 <!-- Philippines -->
 <country code="ph">
 	<provider>
@@ -3753,7 +5121,14 @@
 		<gsm>
 			<network-id mcc="515" mnc="02"/>
 			<apn value="internet.globe.com.ph">
-				<name>Internet</name>
+				<name>Postpaid</name>
+				<username>globe</username>
+				<password>globe</password>
+				<dns>203.127.225.10</dns>
+				<dns>203.127.225.11</dns>
+			</apn>
+			<apn value="http.globe.com.ph">
+				<name>Prepaid</name>
 				<username>globe</username>
 				<password>globe</password>
 				<dns>203.127.225.10</dns>
@@ -3873,6 +5248,7 @@
 	<provider>
 		<name>Heyah</name>
 		<gsm>
+			<network-id mcc="260" mnc="02"/>
 			<apn value="heyah.pl">
 				<username>heyah</username>
 				<password>heyah</password>
@@ -3903,6 +5279,13 @@
 			</apn>
 		</gsm>
 	</provider>
+	<provider>
+		<name>GaduAIR</name>
+		<gsm>
+			<network-id mcc="260" mnc="01"/>
+			<apn value="internet.gadu-gadu.pl"/>
+		</gsm>
+	</provider>
 </country>
 
 <!-- Portugal -->
@@ -3910,8 +5293,15 @@
 	<provider>
 		<name>Kanguru</name>
 		<gsm>
-			<network-id mcc="286" mnc="03"/>
-			<apn value="myconnection">
+			<network-id mcc="268" mnc="03"/>
+			<apn value="kanguru-portatil">
+				<name>Portable</name>
+				<name xml:lang="pt">Portátil</name>
+				<dns>62.169.67.172</dns>
+				<dns>62.169.67.171</dns>
+			</apn>
+			<apn value="kanguru-tempo">
+				<name>Tempo (Prepaid)</name>
 				<dns>62.169.67.172</dns>
 				<dns>62.169.67.171</dns>
 			</apn>
@@ -3923,10 +5313,22 @@
 		</gsm>
 	</provider>
 	<provider>
+		<!-- Merged with Optimus in 2010 -->
+		<name>Clix</name>
+		<gsm>
+			<network-id mcc="268" mnc="03"/>
+			<apn value="clixinternetmovel"/>
+		</gsm>
+	</provider>
+	<provider>
 		<name>Optimus</name>
 		<gsm>
-			<network-id mcc="286" mnc="03"/>
+			<network-id mcc="268" mnc="03"/>
+			<apn value="umts">
+				<name>3G</name>
+			</apn>
 			<apn value="internet">
+				<name>GPRS</name>
 				<dns>194.79.69.129</dns>
 			</apn>
 		</gsm>
@@ -3934,8 +5336,10 @@
 	<provider>
 		<name>TMN</name>
 		<gsm>
-			<network-id mcc="286" mnc="06"/>
+			<network-id mcc="268" mnc="06"/>
 			<apn value="internet">
+				<username>tmn</username>
+				<password>tmn</password>
 				<dns>194.65.3.20</dns>
 				<dns>194.65.3.21</dns>
 			</apn>
@@ -3944,10 +5348,10 @@
 	<provider>
 		<name>Vodafone</name>
 		<gsm>
-			<network-id mcc="286" mnc="01"/>
+			<network-id mcc="268" mnc="01"/>
 			<apn value="internet.vodafone.pt">
-				<dns>212.18.160.133</dns>
-				<dns>212.18.160.134</dns>
+				<username>vodafone</username>
+				<password>vodafone</password>
 			</apn>
 		</gsm>
 	</provider>
@@ -3984,6 +5388,64 @@
 			</apn>
 		</gsm>
 	</provider>
+	<provider>
+		<name>Claro</name>
+		<gsm>
+			<network-id mcc="744" mnc="02"/>
+			<apn value="gprs.claro.com.py">
+				<name>Internet</name>
+			</apn>
+		</gsm>
+	</provider>
+</country>
+
+<!-- Qatar -->
+<country code="qa">
+	<provider>
+		<name>Vodafone</name>
+		<gsm>
+			<network-id mcc="427" mnc="02"/>
+			<apn value="vodafone.com.qa">
+				<name>Web (old)</name>
+			</apn>
+			<apn value="web.vodafone.com.qa">
+				<name>Web</name>
+			</apn>
+		</gsm>
+	</provider>
+	<provider>
+		<name>Q-Tel</name>
+		<gsm>
+			<network-id mcc="427" mnc="01"/>
+			<apn value="gprs.qtel">
+				<name>Qatarnet</name>
+				<username>gprs</username>
+				<password>gprs</password>
+			</apn>
+		</gsm>
+	</provider>
+</country>
+
+<!-- Réunion (France) -->
+<country code="re">
+	<provider>
+		<name>SFR Réunion</name>
+		<gsm>
+			<network-id mcc="647" mnc="10"/>
+			<apn value="websfr">
+				<name>Contract / Prepaid</name>
+			</apn>
+			<apn value="slsfr">
+				<name>SFR slsfr</name>
+			</apn>
+			<apn value="internetpro">
+				<name>SFR internetpro</name>
+			</apn>
+			<apn value="ipnet">
+				<name>SFR ipnet</name>
+			</apn>
+		</gsm>
+	</provider>
 </country>
 
 <!-- Romania -->
@@ -4002,11 +5464,30 @@
 		<name>Vodafone</name>
 		<gsm>
 			<network-id mcc="226" mnc="01"/>
+			<apn value="tobe.vodafone.ro">
+				<name>Mobile Internet (Prepaid)</name>
+				<username>tobe.vodafone.ro</username>
+				<password>vodafone</password>
+			</apn>
 			<apn value="internet.vodafone.ro">
+				<name>Mobile Internet (Postpaid)</name>
 				<username>internet.vodafone.ro</username>
 				<password>vodafone</password>
-				<dns>193.230.161.3</dns>
-				<dns>193.230.161.4</dns>
+			</apn>
+			<apn value="internet.pre.vodafone.ro">
+				<name>Mobile Internet (Prepaid)</name>
+				<username>internet.pre.vodafone.ro</username>
+				<password>vodafone</password>
+			</apn>
+			<apn value="live.vodafone.com">
+				<name>Live! (Postpaid)</name>
+				<username>live</username>
+				<password>vodafone</password>
+			</apn>
+			<apn value="live.pre.vodafone.ro">
+				<name>Live! (Prepaid)</name>
+				<username>live.pre.vodafone.com</username>
+				<password>vodafone</password>
 			</apn>
 		</gsm>
 	</provider>
@@ -4017,6 +5498,18 @@
 			<password>zapp</password>
 		</cdma>
 	</provider>
+	<provider>
+		<name>Digi.Net Mobil</name>
+		<gsm>
+			<network-id mcc="226" mnc="05"/>
+			<apn value="internet">
+				<name>Home</name>
+			</apn>
+			<apn value="static">
+				<name>Business (static)</name>
+			</apn>
+		</gsm>
+	</provider>
 </country>
 
 <!-- Serbia -->
@@ -4054,6 +5547,18 @@
 	</provider>
 </country>
 
+<!-- Rwanda -->
+<country code="rw">
+	<provider>
+		<name>MTN</name>
+		<gsm>
+			<network-id mcc="635" mnc="10"/>
+			<apn value="internet.mtn">
+			</apn>
+		</gsm>
+	</provider>
+</country>
+
 <!-- Russia -->
 <country code="ru">
 	<provider>
@@ -4231,19 +5736,111 @@
 		<name xml:lang="ru">Теле2</name>
 		<gsm>
 			<network-id mcc="250" mnc="20"/>
-			<apn value="wap.tele2.ru">
-				<username>gprs</username>
+			<apn value="internet.tele2.ru">
 				<dns>130.244.127.161</dns>
 				<dns>130.244.127.169</dns>
 			</apn>
 		</gsm>
 	</provider>
 	<provider>
-		<name>Skylink (Moscow)</name>
-		<name xml:lang="ru">Скайлинк Москва</name>
+		<name>Skylink</name>
+		<name xml:lang="ru">Скайлинк</name>
 		<cdma>
-			<username>mobile at skylink.msk.ru</username>
+			<username>mobile</username>
 			<password>internet</password>
+
+			<!-- Assignments taken from IFAST: http://www.ifast.org/files/NationalSID.htm -->
+			<sid value="11396"/>  <!-- Khabarovsk area -->
+			<sid value="11398"/>  <!-- Adygeya -->
+			<sid value="11400"/>  <!-- Altay republic -->
+			<sid value="11418"/>  <!-- Bashkostostan -->
+			<sid value="11424"/>  <!-- Buryatiya -->
+			<sid value="11432"/>  <!-- Dagestan -->
+			<sid value="11434"/>  <!-- Ingushetia -->
+			<sid value="11438"/>  <!-- Kabardino-Balkariya -->
+			<sid value="11440"/>  <!-- Kalmykia -->
+			<sid value="11442"/>  <!-- Karachayevo-Cherkessiya -->
+			<sid value="11446"/>  <!-- Karelia -->
+			<sid value="11452"/>  <!-- Komi -->
+			<sid value="11456"/>  <!-- Mordovia -->
+			<sid value="11462"/>  <!-- Yakutiya -->
+			<sid value="11465"/>  <!-- North Osetia -->
+			<sid value="11482"/>  <!-- Tatarstan -->
+			<sid value="11484"/>  <!-- Tuva -->
+			<sid value="11492"/>  <!-- Udmurtiya -->
+			<sid value="11494"/>  <!-- Khakasia -->
+			<sid value="11498"/>  <!-- Chechnya -->
+			<sid value="11510"/>  <!-- Altay area -->
+			<sid value="11532"/>  <!-- Krasnodar -->
+			<sid value="11546"/>  <!-- Krasnoyarsk -->
+			<sid value="11556"/>  <!-- Primorsky area -->
+			<sid value="11568"/>  <!-- Stavropol -->
+			<sid value="11572"/>  <!-- Amur area -->
+			<sid value="11578"/>  <!-- Arkhangelsk -->
+			<sid value="11582"/>  <!-- Astrakhan -->
+			<sid value="11590"/>  <!-- Belgorod -->
+			<sid value="11596"/>  <!-- Bryansk -->
+			<sid value="11604"/>  <!-- Vladimir -->
+			<sid value="11616"/>  <!-- Volgograd -->
+			<sid value="11622"/>  <!-- Vologda -->
+			<sid value="11630"/>  <!-- Ivanovo -->
+			<sid value="11642"/>  <!-- Irkutsk -->
+			<sid value="11646"/>  <!-- Kaliningrad -->
+			<sid value="11650"/>  <!-- Kaluga -->
+			<sid value="11668"/>  <!-- Kemerovo -->
+			<sid value="11672"/>  <!-- Kostroma -->
+			<sid value="11676"/>  <!-- Kurgan -->
+			<sid value="11684"/>  <!-- Kursk -->
+			<sid value="11692"/>  <!-- Leningrad area -->
+			<sid value="11698"/>  <!-- Lipetsk -->
+			<sid value="11700"/>  <!-- Magadan -->
+			<sid value="11732"/>  <!-- Moscow area -->
+			<sid value="11736"/>  <!-- Murmansk -->
+			<sid value="11754"/>  <!-- Nizhniy Novgorod -->
+			<sid value="11758"/>  <!-- V. Novgorog -->
+			<sid value="11772"/>  <!-- Novosibirsk -->
+			<sid value="11780"/>  <!-- Kirov -->
+			<sid value="11784"/>  <!-- Chuvashia -->
+			<sid value="11788"/>  <!-- Evreysky district -->
+			<sid value="11790"/>  <!-- Aginsky-Buryatsky district -->
+			<sid value="11794"/>  <!-- Penza -->
+			<sid value="11802"/>  <!-- Mariy El -->
+			<sid value="11806"/>  <!-- Koryak district -->
+			<sid value="11816"/>  <!-- Omsk -->
+			<sid value="11826"/>  <!-- Orenburg -->
+			<sid value="11830"/>  <!-- Orel -->
+			<sid value="11844"/>  <!-- Perm -->
+			<sid value="11848"/>  <!-- Pskov -->
+			<sid value="11868"/>  <!-- Rostov -->
+			<sid value="11874"/>  <!-- Tomsk -->
+			<sid value="11884"/>  <!-- Voronezh -->
+			<sid value="11892"/>  <!-- Ryazan -->
+			<sid value="11908"/>  <!-- Samara -->
+			<sid value="11922"/>  <!-- Saratov -->
+			<sid value="11924"/>  <!-- Sakhalin -->
+			<sid value="11948"/>  <!-- Sverdlovsk -->
+			<sid value="11960"/>  <!-- Tambov -->
+			<sid value="11964"/>  <!-- Smolensk -->
+			<sid value="11968"/>  <!-- Tver -->
+			<sid value="11978"/>  <!-- Tula -->
+			<sid value="11984"/>  <!-- Tyumen -->
+			<sid value="11990"/>  <!-- Ul yanovsk -->
+			<sid value="12006"/>  <!-- Chelyabinsk -->
+			<sid value="12012"/>  <!-- Chita -->
+			<sid value="12020"/>  <!-- Yaroslavl -->
+			<sid value="12060"/>  <!-- Moscow -->
+			<sid value="12061"/>  <!-- Moscow -->
+			<sid value="12063"/>  <!-- St. Petersburg -->
+			<sid value="12064"/>  <!-- St. Petersburg -->
+			<sid value="12065"/>  <!-- Kemerovo -->
+			<sid value="12066"/>  <!-- Kemerovo -->
+			<sid value="12067"/>  <!-- Sverdlovsk -->
+			<sid value="12085"/>  <!-- Nenetskiy district -->
+			<sid value="12087"/>  <!-- Ust-Ordynsky district -->
+			<sid value="12090"/>  <!-- Khanty-Mansi district -->
+			<sid value="12092"/>  <!-- Chukotsky district -->
+			<sid value="12094"/>  <!-- Yamal-Nenets district -->
+			<sid value="12095"/>  <!-- Kamchatka -->
 		</cdma>
 	</provider>
 	<provider>
@@ -4295,12 +5892,11 @@
 		<name>3</name>
 		<gsm>
 			<network-id mcc="240" mnc="02"/>
-
+			<network-id mcc="240" mnc="04"/>
 			<!-- http://www.tre.se/templates/Sporg3_02.aspx?id=4231 -->
 			<apn value="data.tre.se">
 				<name>Mobiltelefon</name>
 			</apn>
-
 			<!-- http://www.tre.se/templates/Sporg3_02.aspx?id=4231 -->
 			<apn value="bredband.tre.se">
 				<name>Bredband</name>
@@ -4313,8 +5909,15 @@
 	<provider>
 		<name>Glocalnet</name>
 		<gsm>
-			<!-- http://mobiltbredband.glocalnet.se/ -->
-			<apn value="internet.glocalnet.se"/>
+			<network-id mcc="240" mnc="08"/>
+			<!-- http://glocalnet.se/mobiltbredband -->
+			<apn value="bredband.glocalnet.se">
+				<name>Mobilt Bredband</name>
+			</apn>
+			<!-- http://kundservice.glocalnet.se/Kundservice/Mobiltelefoni/Installningar/ -->
+			<apn value="internet.glocalnet.se">
+				<name>Glocalnet Internet</name>
+			</apn>
 		</gsm>
 	</provider>
 	<provider>
@@ -4334,46 +5937,120 @@
 			<password>cdma</password>
 		</cdma>
 	</provider>
-	<!-- http://www.tele2.se/internet-via-gprs.html -->
 	<provider>
-		<name>Tele2/Comviq</name>
+		<name>Tele2</name>
 		<gsm>
 			<network-id mcc="240" mnc="07"/>
 			<network-id mcc="240" mnc="05"/>
-			<apn value="internet.tele2.se"/>
+			<balance-check>
+				<ussd>*111#</ussd>
+				<dtmf>211</dtmf>
+			</balance-check>
+			<!-- http://www.tele2.se/internet-via-gprs.html -->
+			<apn value="internet.tele2.se">
+				<name>Mobilt Internet</name>
+			</apn>
+			<!-- http://www.tele2.se/alien-modem.html -->
+			<apn value="mobileinternet.tele2.se">
+				<name>Mobilt Bredband</name>
+			</apn>
+		</gsm>
+	</provider>
+	<provider>
+		<name>Comviq</name>
+		<gsm>
+			<network-id mcc="240" mnc="07"/>
+			<network-id mcc="240" mnc="05"/>
+			<apn value="data.comviq.se">
+				<name>Surf</name>
+			</apn>
+		</gsm>
+	</provider>
+	<provider>
+		<name>Multicom Security</name>
+		<gsm>
+			<network-id mcc="240" mnc="01"/>
+			<network-id mcc="240" mnc="05"/>
+			
+			<!-- http://multicomsecurity.se/produkter-tjanster/mobil-datakommunikation/mobiflex/ -->
+			<apn value="mobiflex.telia.se">
+				<name>Mobiflex</name>
+			</apn>
 		</gsm>
 	</provider>
 	<provider>
 		<name>Telenor</name>
 		<gsm>
+			<network-id mcc="240" mnc="04"/>
 			<network-id mcc="240" mnc="06"/>
 			<network-id mcc="240" mnc="08"/>
 
 			<!-- http://www.telenor.se/privat/mobiltelefoni/alla-mobiltjanster/alla-mobiltjanster.html#C45-2100 -->
 			<apn value="internet.telenor.se">
-				<name>Mobilt bredband</name>
+				<name>Mobilt Internet</name>
 			</apn>
 			<apn value="services.telenor.se">
 				<name>Mobilsurf med maxtaxa</name>
 			</apn>
+			<apn value="bredband.telenor.se">
+				<name>Mobilt Bredband</name>
+			</apn>
+		</gsm>
+	</provider>
+	<provider>
+		<name>Telia</name>
+		<gsm>
+			<network-id mcc="240" mnc="01"/>
+			<network-id mcc="240" mnc="05"/>
+			<balance-check>
+				<ussd>*120#</ussd>
+				<ussd>*121#</ussd>
+			</balance-check>
+			<!-- http://www3.telia.se/foretag/mobilguiden/ -->
+			<apn value="online.telia.se"/>
+		</gsm>
+	</provider>
+	<provider>
+		<name>TDC</name>
+		<gsm>
+			<network-id mcc="240" mnc="14"/>
+			<apn value="internet.se"/>
 		</gsm>
 	</provider>
 	<provider>
-		<name>Telia</name>
+		<name>djuice</name>
 		<gsm>
-			<network-id mcc="240" mnc="01"/>
-			<network-id mcc="240" mnc="05"/>
-
-			<!-- http://www3.telia.se/foretag/mobilguiden/ -->
-			<apn value="online.telia.se"/>
+			<network-id mcc="240" mnc="09"/>
+			<apn value="internet.djuice.se"/>
 		</gsm>
 	</provider>
 	<provider>
-		<name>TDC</name>
+		<name>Com Hem</name>
+		<gsm>
+			<network-id mcc="240" mnc="02"/>
+			<network-id mcc="240" mnc="04"/>
+			<!-- MVNO operating on 3's network -->
+			<apn value="bredband.comhem.se"/>
+		</gsm>
+	</provider>
+	<provider>
+		<name>Parlino</name>
 		<gsm>
 			<network-id mcc="240" mnc="07"/>
-			<network-id mcc="240" mnc="05"/>
-			<apn value="internet.se"/>
+			<apn value="internet.parlino.se"/>
+		</gsm>
+	</provider>
+	<provider>
+		<name>Universal Telecom</name>
+		<gsm>
+			<!-- http://www.uvtc.com/SWEDEN/internet/mobiltbredband/Default.aspx -->
+			<apn value="sp-internet">
+				<name>Mobilt Bredband</name>
+			</apn>
+			<!-- http://www.uvtc.com/sweden/Mobil/Faq/default.aspx -->
+			<apn value="internet.uvtc.com">
+				<name>Mobilt Internet</name>
+			</apn>
 		</gsm>
 	</provider>
 </country>
@@ -4384,11 +6061,28 @@
 		<name>M1</name>
 		<gsm>
 			<network-id mcc="525" mnc="03"/>
+			<!-- http://m1.com.sg/filedownloads/popup/Miworld/popup_se2.5.html mid page -->
 			<apn value="sunsurf">
+				<name>SunSurf/Mobile Broadband (postpaid)</name>
 				<username>65</username>
+			</apn>
+			<!-- http://m1.com.sg/filedownloads/popup/Miworld/popup_se2.5.html top page-->
+			<apn value="miworld">
+				<name>MiWorld Mobile (postpaid)</name>
+				<username>65(mobilenumber)</username>
+				<password>user123</password>
+			</apn>
+			<!-- http://m1.com.sg/filedownloads/popup/Miworld/popup_se2.5.html lower page -->
+			<apn value="miworldcard">
+				<name>MiWorld Mobile (prepaid)</name>
+				<username>65(mobilenumber)</username>
 				<password>user123</password>
-				<dns>202.79.64.21</dns>
-				<dns>202.79.64.26</dns>
+			</apn>
+			<apn value="prepaidbb">
+				<name>Mobile Broadband (prepaid)</name>
+			</apn>
+			<apn value="sunsurfmcard">
+				<name>M Card (prepaid)</name>
 			</apn>
 		</gsm>
 	</provider>
@@ -4408,10 +6102,17 @@
 		<gsm>
 			<network-id mcc="525" mnc="05"/>
 			<apn value="shwap">
+				<name>WAP</name>
 				<username>star</username>
 				<password>hub</password>
 				<dns>203.116.1.78</dns>
 			</apn>
+			<apn value="shppd">
+				<name>MaxMobile Broadband (prepaid)</name>
+			</apn>
+			<apn value="shinternet">
+				<name>MaxMobile Broadband (postpaid)</name>
+			</apn>
 		</gsm>
 	</provider>
 </country>
@@ -4441,15 +6142,20 @@
 	<provider>
 		<name>Vodafone / Simobil</name>
 		<gsm>
-			<network-id mcc="525" mnc="40"/>
+			<network-id mcc="293" mnc="40"/>
 			<apn value="internet.simobil.si">
 				<username>simobil</username>
 				<password>internet</password>
-				<dns>121.30.86.130</dns>
-				<dns>193.189.160.11</dns>
 			</apn>
 		</gsm>
 	</provider>
+	<provider>
+		<name>T-2</name>
+		<gsm>
+			<network-id mcc="293" mnc="64"/>
+			<apn value="internet.t-2.net"/>
+		</gsm>
+	</provider>
 </country>
 
 <!-- Slovakia -->
@@ -4475,6 +6181,15 @@
 			</apn>
 		</gsm>
 	</provider>
+	<provider>
+		<name>O2</name>
+		<gsm>
+			<network-id mcc="231" mnc="06"/>
+			<apn value="o2internet">
+				<name>Internet</name>
+			</apn>
+		</gsm>
+	</provider>
 </country>
 
 <!-- Senegal -->
@@ -4497,7 +6212,7 @@
 		<name>movistar</name>
 		<gsm>
 			<network-id mcc="706" mnc="04"/>
-			<apn value="movistar.sv">
+			<apn value="internet.movistar.sv">
 				<username>movistarsv</username>
 				<password>movistarsv</password>
 			</apn>
@@ -4528,6 +6243,17 @@
 	</provider>
 </country>
 
+<!-- Sudan -->
+<country code="sd">
+	<provider>
+		<name>Zain</name>
+		<gsm>
+			<network-id mcc="634" mnc="01"/>
+			<apn value="internet"/>
+		</gsm>
+	</provider>
+</country>
+
 <!-- Thailand -->
 <country code="th">
 	<provider>
@@ -4560,6 +6286,29 @@
 			</apn>
 		</gsm>
 	</provider>
+	<provider>
+		<name>TOT 3G</name>
+		<gsm>
+			<network-id mcc="520" mnc="15"/>
+			<apn value="internet" />
+		</gsm>
+	</provider>
+</country>
+
+<!-- Tunisia -->
+<country code="tn">
+	<provider>
+		<name>Orange</name>
+		<gsm>
+			<network-id mcc="605" mnc="01"/>
+			<apn value="keygp">
+				<name>Internet Everywhere Prepaid</name>
+			</apn>
+			<apn value="keypro">
+				<name>Internet Everywhere Professional</name>
+			</apn>
+		</gsm>
+	</provider>
 </country>
 
 <!-- Turkey -->
@@ -4594,9 +6343,17 @@
 		</gsm>
 	</provider>
 	<provider>
-		<name>Vodafone</name>
+		<name>Vodafone / KKTC Telsim</name>
 		<gsm>
-			<network-id mcc="286" mnc="02"/>
+			<network-id mcc="286" mnc="02"/><!-- mnc="0251" in Vodofone XML -->
+			<apn value="edje.kktctelsim.com">
+				<name>Faturali / Kontorlu</name>
+			</apn>
+			<apn value="internet">
+				<name>KKTC Telsim</name>
+				<username>vodafone</username>
+				<password>vodafone</password>
+			</apn>
 			<apn value="telsim">
 				<name>Postpaid</name>
 				<username>telsim</username>
@@ -4644,6 +6401,9 @@
 		<name xml:lang="zh">中華電信 (emome)</name>
 		<gsm>
 			<network-id mcc="466" mnc="92"/>
+			<!-- http://www.nav4all.com/site2/www.nav4all.com/enguk/gprs_settings_taiwan_chunghwatelekom_nav4all.php?m=F3 -->
+			<apn value="emome"/>
+			<!-- Vodafone Broadband Connect version 10.1.0.23908 2010-06-07T17:47:01 lists username/pass = web. Others list empty -->
 			<apn value="internet"/>
 		</gsm>
 	</provider>
@@ -4686,6 +6446,48 @@
 	</provider>
 </country>
 
+<!-- Tanzania, United Republic of -->
+<country code="tz">
+	<provider>
+		<name>Zain</name>
+		<gsm>
+			<network-id mcc="640" mnc="05"/>
+			<apn value="internet"/>
+		</gsm>
+	</provider>
+	<provider>
+		<name>Vodacom</name>
+		<gsm>
+			<network-id mcc="640" mnc="04"/>
+			<apn value="internet"/>
+		</gsm>
+	</provider>
+	<provider>
+		<name>Zantel</name>
+		<gsm>
+			<network-id mcc="640" mnc="03"/>
+			<apn value="znet"/>
+		</gsm>
+		<cdma>
+			<username>@zantel.com</username>
+			<password> </password>
+		</cdma>
+	</provider>
+	<provider>
+		<name>Sasatel</name>
+		<cdma>
+			<username>sasatel</username>
+			<password>sasatel</password>
+			<!-- Assignments taken from IFAST: http://www.ifast.org/files/NationalSID.htm -->
+			<sid value="9891"/>
+		</cdma>
+	</provider>
+	<provider>
+		<name>TTCL</name>
+		<cdma/>
+	</provider>
+</country>
+
 <!-- Ukraine -->
 <country code="ua">
 	<provider>
@@ -4698,10 +6500,27 @@
 				<username>igprs</username>
 				<password>internet</password>
 			</apn>
+			<apn value="www.kyivstar.net">
+				<name>Contract GPRS</name>
+			</apn>
+			<apn value="3g.kyivstar.net">
+				<name>Internet 3G</name>
+			</apn>
+		</gsm>
+	</provider>
+	<provider>
+		<name>Djuice</name>
+		<gsm>
+			<network-id mcc="255" mnc="03"/>
+
 			<apn value="www.djuice.com.ua">
-				<name>Djuice</name>
-				<dns>212.58.160.33</dns>
-				<dns>212.58.160.34</dns>
+				<name>Internet GPRS</name>
+			</apn>
+			<apn value="xl.kyivstar.net">
+				<name>Internet XL</name>
+			</apn>
+			<apn value="3g.kyivstar.net">
+				<name>Internet 3G</name>
 			</apn>
 		</gsm>
 	</provider>
@@ -4732,12 +6551,13 @@
 	<provider>
 		<name>Jeans</name>
 		<gsm>
+			<network-id mcc="255" mnc="01"/>
 			<apn value="www.jeans.ua">
 				<dns>80.255.64.23</dns>
 				<dns>80.255.64.24</dns>
 			</apn>
 			<apn value="hyper.net">
-				<name>Hyper</name>
+				<name>Hyper.NET</name>
 				<dns>212.58.160.33</dns>
 				<dns>212.58.160.34</dns>
 			</apn>
@@ -4749,17 +6569,29 @@
 			<network-id mcc="255" mnc="01"/>
 
 			<apn value="internet">
-				<name>Internet</name>
+				<name>GPRS Internet</name>
 				<username>internet</username>
 				<dns>212.58.160.33</dns>
 				<dns>212.58.160.34</dns>
 			</apn>
+			<apn value="hyper.net">
+				<name>Hyper.NET</name>
+			</apn>
+			<apn value="active">
+				<name>HyperActive</name>
+			</apn>
 			<apn value="www.umc.ua">
 				<name>umc.ua</name>
 				<dns>80.255.64.23</dns>
 				<dns>80.255.64.24</dns>
 			</apn>
 		</gsm>
+		<cdma>
+			<name>MTS Connect 3G</name>
+			<username>mobile</username>
+			<password>internet</password>
+			<sid value="15907"/>
+		</cdma>
 	</provider>
 	<provider>
 		<name>Utel</name>
@@ -4768,6 +6600,25 @@
 			<apn value="3g.utel.ua"/>
 		</gsm>
 	</provider>
+	<provider>
+		<name>CDMA Ukraine</name>
+		<cdma>
+			<username>cdma</username>
+			<password>cdma</password>
+		</cdma>
+	</provider>
+	<provider>
+		<name>InterTelecom</name>
+		<cdma>
+			<username>IT at IT</username>
+			<password>IT</password>
+			<sid value="15906"/>
+		</cdma>
+	</provider>
+	<provider>
+		<name>PEOPLEnet</name>
+		<cdma/>
+	</provider>
 </country>
 
 <!-- Uganda -->
@@ -4775,12 +6626,47 @@
 	<provider>
 		<name>MTN</name>
 		<gsm>
+			<network-id mcc="641" mnc="10"/>
 			<apn value="yellopix.mtn.co.ug">
-				<dns>212.88.97.20</dns>
-				<dns>212.88.97.67</dns>
+				<dns>193.108.252.50</dns>
+				<dns>193.108.252.51</dns>
 			</apn>
 		</gsm>
 	</provider>
+    <provider>
+		<name>Orange</name>
+		<gsm>
+			<network-id mcc="641" mnc="14"/>
+			<apn value="orange.ug"/>
+		</gsm>
+	</provider>
+    <provider>
+		<name>UTL</name>
+		<gsm>
+			<network-id mcc="641" mnc="11"/>
+			<apn value="utbroadband">
+				<name>Mobile Broadband</name>
+			</apn>
+			<apn value="utweb">
+				<name>Mobile Internet</name>
+			</apn>
+		</gsm>
+	</provider>
+    <provider>
+		<name>Warid</name>
+		<gsm>
+			<network-id mcc="641" mnc="22"/>
+			<!-- http://www.waridtel.co.ug/gprs.php -->
+			<apn value="web.waridtel.co.ug"/>
+		</gsm>
+	</provider>
+    <provider>
+		<name>Zain</name>
+		<gsm>
+			<network-id mcc="641" mnc="01"/>
+			<apn value="web.ug.zain.com"/>
+		</gsm>
+	</provider>
 </country>
 
 <!-- United States -->
@@ -4794,20 +6680,15 @@
 			<network-id mcc="310" mnc="410"/>
 			<network-id mcc="310" mnc="560"/>
 			<network-id mcc="310" mnc="680"/>
-			<apn value="WAP.CINGULAR">
-				<name>MEdia Net</name>
-				<username>WAP at CINGULARGPRS.COM</username>
-				<password>CINGULAR1</password>
-			</apn>
-			<apn value="ISP.CINGULAR">
-				<name>Data Connect</name>
-				<username>ISP at CINGULARGPRS.COM</username>
-				<password>CINGULAR1</password>
-			</apn>
-			<apn value="ISP.CINGULAR">
-				<name>Data Connect (Accelerated)</name>
-				<username>ISPDA at CINGULARGPRS.COM</username>
-				<password>CINGULAR1</password>
+			<!-- http://www.wireless.att.com/answer-center/main.jsp?solutionId=35078&t=solutionTab -->
+			<apn value="wap.cingular">
+				<name>MEdia Net (phones)</name>
+			</apn>
+			<apn value="Broadband">
+				<name>LaptopConnect (data cards)</name>
+			</apn>
+			<apn value="isp.cingular">
+				<name>Data Connect (old)</name>
 			</apn>
 		</gsm>
 	</provider>
@@ -4829,17 +6710,17 @@
 			<network-id mcc="310" mnc="660"/>
 			<network-id mcc="310" mnc="800"/>
 
+			<apn value="epc.tmobile.com">
+				<name>Internet/WebConnect</name>
+			</apn>
 			<apn value="wap.voicestream.com">
 				<name>Web2Go/t-zones</name>
 			</apn>
 			<apn value="internet2.voicestream.com">
-				<name>Internet</name>
+				<name>Internet (old)</name>
 			</apn>
 			<apn value="internet3.voicestream.com">
-				<name>Internet with VPN</name>
-			</apn>
-			<apn value="epc.tmobile.com">
-				<name>T-Mobile G1</name>
+				<name>Internet with VPN (old)</name>
 			</apn>
 		</gsm>
 	</provider>
@@ -4855,6 +6736,7 @@
 	<provider>
 		<name>Sprint</name>
 		<cdma>
+			<!-- Assignments taken from IFAST: http://www.ifast.org/files/NationalSID.htm -->
 			<sid value="4103"/>
 			<sid value="4106"/>
 			<sid value="4107"/>
@@ -4889,6 +6771,7 @@
 			<sid value="4190"/>
 			<sid value="4194"/>
 			<sid value="4195"/>
+			<sid value="4198"/>
 			<sid value="4274"/>
 			<sid value="4376"/>
 			<sid value="4379"/>
@@ -4912,6 +6795,7 @@
 	<provider>
 		<name>Verizon</name>
 		<cdma>
+			<!-- Assignments taken from IFAST: http://www.ifast.org/files/NationalSID.htm -->
 			<sid value="2"/>
 			<sid value="4"/>
 			<sid value="5"/>
@@ -4934,6 +6818,7 @@
 			<sid value="41"/>
 			<sid value="48"/>
 			<sid value="51"/>
+			<sid value="54"/>
 			<sid value="56"/>
 			<sid value="58"/>
 			<sid value="59"/>
@@ -4954,31 +6839,233 @@
 			<sid value="104"/>
 			<sid value="107"/>
 			<sid value="110"/>
+			<sid value="112"/>
+			<sid value="113"/>
+			<sid value="119"/>
+			<sid value="126"/>
+			<sid value="127"/>
+			<sid value="133"/>
+			<sid value="137"/>
+			<sid value="139"/>
+			<sid value="143"/>
+			<sid value="150"/>
+			<sid value="154"/>
+			<sid value="162"/>
+			<sid value="163"/>
+			<sid value="165"/>
+			<sid value="170"/>
+			<sid value="172"/>
+			<sid value="179"/>
+			<sid value="180"/>
+			<sid value="181"/>
+			<sid value="186"/>
+			<sid value="189"/>
+			<sid value="190"/>
+			<sid value="203"/>
+			<sid value="213"/>
+			<sid value="214"/>
+			<sid value="222"/>
+			<sid value="224"/>
+			<sid value="226"/>
+			<sid value="228"/>
+			<sid value="241"/>
+			<sid value="250"/>
+			<sid value="258"/>
+			<sid value="262"/>
+			<sid value="263"/>
+			<sid value="266"/>
+			<sid value="272"/>
+			<sid value="276"/>
+			<sid value="284"/>
+			<sid value="286"/>
+			<sid value="294"/>
+			<sid value="298"/>
+			<sid value="299"/>
+			<sid value="300"/>
+			<sid value="314"/>
+			<sid value="316"/>
+			<sid value="319"/>
+			<sid value="323"/>
+			<sid value="328"/>
+			<sid value="329"/>
+			<sid value="330"/>
+			<sid value="349"/>
+			<sid value="356"/>
+			<sid value="377"/>
+			<sid value="385"/>
+			<sid value="404"/>
+			<sid value="428"/>
+			<sid value="443"/>
+			<sid value="456"/>
+			<sid value="465"/>
+			<sid value="482"/>
+			<sid value="483"/>
+			<sid value="486"/>
+			<sid value="490"/>
+			<sid value="498"/>
+			<sid value="502"/>
+			<sid value="506"/>
+			<sid value="528"/>
+			<sid value="530"/>
+			<sid value="532"/>
+			<sid value="539"/>
+			<sid value="1015"/>
+			<sid value="1026"/>
+			<sid value="1032"/>
+			<sid value="1034"/>
+			<sid value="1062"/>
+			<sid value="1072"/>
+			<sid value="1074"/>
+			<sid value="1076"/>
+			<sid value="1083"/>
+			<sid value="1086"/>
+			<sid value="1088"/>
+			<sid value="1094"/>
+			<sid value="1103"/>
+			<sid value="1129"/>
+			<sid value="1131"/>
+			<sid value="1137"/>
+			<sid value="1139"/>
+			<sid value="1145"/>
+			<sid value="1151"/>
+			<sid value="1153"/>
+			<sid value="1164"/>
+			<sid value="1166"/>
+			<sid value="1174"/>
+			<sid value="1180"/>
+			<sid value="1189"/>
+			<sid value="1193"/>
+			<sid value="1196"/>
+			<sid value="1220"/>
+			<sid value="1224"/>
+			<sid value="1227"/>
+			<sid value="1230"/>
+			<sid value="1267"/>
+			<sid value="1285"/>
+			<sid value="1330"/>
+			<sid value="1358"/>
+			<sid value="1417"/>
+			<sid value="1429"/>
+			<sid value="1476"/>
+			<sid value="1488"/>
+			<sid value="1492"/>
+			<sid value="1494"/>
+			<sid value="1506"/>
+			<sid value="1510"/>
+			<sid value="1514"/>
+			<sid value="1516"/>
+			<sid value="1517"/>
+			<sid value="1519"/>
+			<sid value="1523"/>
+			<sid value="1548"/>
+			<sid value="1552"/>
+			<sid value="1563"/>
+			<sid value="1567"/>
+			<sid value="1614"/>
+			<sid value="1626"/>
+			<sid value="1630"/>
+			<sid value="1632"/>
+			<sid value="1637"/>
+			<sid value="1639"/>
+			<sid value="1641"/>
+			<sid value="1653"/>
+			<sid value="1679"/>
+			<sid value="1736"/>
+			<sid value="1740"/>
+			<sid value="1749"/>
+			<sid value="1760"/>
+			<sid value="1776"/>
+			<sid value="1780"/>
+			<sid value="1790"/>
+			<sid value="1792"/>
+			<sid value="1824"/>
+			<sid value="1826"/>
+			<sid value="1827"/>
+			<sid value="1830"/>
+			<sid value="1832"/>
+			<sid value="1857"/>
+			<sid value="1910"/>
+			<sid value="1912"/>
+			<sid value="1940"/>
+			<sid value="1969"/>
+			<sid value="2004"/>
+			<sid value="2054"/>
+			<sid value="2058"/>
+			<sid value="2060"/>
+			<sid value="2076"/>
+			<sid value="2115"/>
+			<sid value="2119"/>
+			<sid value="2125"/>
+			<sid value="2127"/>
+			<sid value="2149"/>
+			<sid value="3004"/>
+			<sid value="3008"/>
+			<sid value="3046"/>
+			<sid value="3066"/>
+			<sid value="3216"/>
+			<sid value="3218"/>
+			<sid value="3228"/>
+			<sid value="6709"/>
+			<sid value="6711"/>
+			<sid value="7532"/>
+			<sid value="7536"/>
+			<sid value="9640"/>
+			<sid value="9642"/>
+			<sid value="9644"/>
 		</cdma>
 	</provider>
 	<provider>
 		<name>US Cellular</name>
 		<cdma>
+			<!-- Assignments taken from IFAST: http://www.ifast.org/files/NationalSID.htm
+			     NOTE: SIDs listed as "HOLLAND & KNIGHT LLP" are counted for US Cellular
+			           because HOLLAND & KNIGHT LLP/Peter M. Connolly appears to be the
+			           license administrator for US Cellular in those license areas listed
+			           in the IFAST SID database as assigned to HOLLAND & KNIGHT LLP.
+			           When a search of the FCC's ULS for the CMA noted for a SID by
+			           IFAST does not return an active license held by
+			           US Cellular/HOLLAND & KNIGHT LLP, that SID is not counted
+			           for US Cellular (ex SID 1925, 1935, 5289, 5291, 5293, etc).
+			-->
+			<sid value="5"/>
+			<sid value="104"/>
+			<sid value="166"/>
+			<sid value="191"/>
 			<sid value="193"/>
+			<sid value="195"/>
 			<sid value="217"/>
 			<sid value="221"/>
 			<sid value="246"/>
+			<sid value="298"/>
+			<sid value="303"/>
 			<sid value="309"/>
 			<sid value="331"/>
+			<sid value="333"/>
+			<sid value="340"/>
+			<sid value="364"/>
+			<sid value="384"/>
+			<sid value="389"/>
 			<sid value="393"/>
 			<sid value="413"/>
 			<sid value="445"/>
+			<sid value="580"/>
 			<sid value="599"/>
+			<sid value="1059"/>
 			<sid value="1061"/>
 			<sid value="1075"/>
 			<sid value="1173"/>
 			<sid value="1175"/>
+			<sid value="1200"/>
+			<sid value="1211"/>
 			<sid value="1213"/>
 			<sid value="1219"/>
 			<sid value="1223"/>
 			<sid value="1228"/>
 			<sid value="1229"/>
+			<sid value="1237"/>
 			<sid value="1272"/>
+			<sid value="1317"/>
+			<sid value="1320"/>
 			<sid value="1399"/>
 			<sid value="1403"/>
 			<sid value="1406"/>
@@ -4986,24 +7073,43 @@
 			<sid value="1425"/>
 			<sid value="1427"/>
 			<sid value="1484"/>
+			<sid value="1521"/>
 			<sid value="1541"/>
+			<sid value="1543"/>
 			<sid value="1574"/>
 			<sid value="1595"/>
 			<sid value="1607"/>
 			<sid value="1610"/>
 			<sid value="1643"/>
-			<sid value="1729"/>
+			<sid value="1753"/>
 			<sid value="1779"/>
-			<sid value="1784"/>
+			<sid value="1783"/>
+			<sid value="1794"/>
+			<sid value="1802"/>
+			<sid value="1819"/>
+			<sid value="1821"/>
+			<sid value="1881"/>
+			<sid value="1914"/>
+			<sid value="1983"/>
+			<sid value="2066"/>
+			<sid value="2141"/>
 		</cdma>
 	</provider>
 	<provider>
 		<name>Alltel</name>
+		<gsm>
+			<!-- Former Western Wireless (roaming only) -->
+			<network-id mcc="310" mnc="590"/>
+		</gsm>
 		<cdma>
+			<!-- Assignments taken from IFAST: http://www.ifast.org/files/NationalSID.htm -->
+			<sid value="32"/>
 			<sid value="42"/>
+			<sid value="52"/>
 			<sid value="53"/>
 			<sid value="54"/>
 			<sid value="57"/>
+			<sid value="71"/>
 			<sid value="74"/>
 			<sid value="79"/>
 			<sid value="83"/>
@@ -5021,7 +7127,9 @@
 			<sid value="152"/>
 			<sid value="156"/>
 			<sid value="182"/>
+			<sid value="186"/>
 			<sid value="188"/>
+			<sid value="202"/>
 			<sid value="204"/>
 			<sid value="205"/>
 			<sid value="208"/>
@@ -5032,47 +7140,118 @@
 			<sid value="244"/>
 			<sid value="256"/>
 			<sid value="260"/>
+			<sid value="272"/>
 			<sid value="281"/>
+			<sid value="282"/>
+			<sid value="292"/>
+			<sid value="304"/>
+			<sid value="306"/>
 			<sid value="312"/>
 			<sid value="318"/>
+			<sid value="338"/>
 			<sid value="342"/>
+			<sid value="344"/>
 			<sid value="348"/>
 			<sid value="350"/>
 			<sid value="368"/>
 			<sid value="374"/>
 			<sid value="376"/>
 			<sid value="386"/>
+			<sid value="387"/>
 			<sid value="392"/>
 			<sid value="396"/>
 			<sid value="416"/>
 			<sid value="418"/>
 			<sid value="424"/>
+			<sid value="430"/>
 			<sid value="440"/>
 			<sid value="444"/>
 			<sid value="448"/>
+			<sid value="462"/>
 			<sid value="478"/>
+			<sid value="487"/>
+			<sid value="491"/>
+			<sid value="504"/>
+			<sid value="518"/>
 			<sid value="520"/>
 			<sid value="544"/>
 			<sid value="546"/>
+			<sid value="547"/>
 			<sid value="550"/>
+			<sid value="558"/>
+			<sid value="570"/>
 			<sid value="578"/>
+			<sid value="1008"/>
+			<sid value="1012"/>
+			<sid value="1014"/>
+			<sid value="1016"/>
+			<sid value="1025"/>
+			<sid value="1031"/>
+			<sid value="1033"/>
 			<sid value="1038"/>
+			<sid value="1040"/>
+			<sid value="1042"/>
+			<sid value="1044"/>
+			<sid value="1046"/>
+			<sid value="1048"/>
+			<sid value="1052"/>
+			<sid value="1054"/>
+			<sid value="1056"/>
 			<sid value="1058"/>
 			<sid value="1093"/>
+			<sid value="1118"/>
+			<sid value="1120"/>
 			<sid value="1124"/>
+			<sid value="1126"/>
 			<sid value="1148"/>
+			<sid value="1154"/>
+			<sid value="1156"/>
+			<sid value="1236"/>
+			<sid value="1244"/>
+			<sid value="1246"/>
+			<sid value="1248"/>
+			<sid value="1250"/>
+			<sid value="1252"/>
+			<sid value="1254"/>
+			<sid value="1256"/>
 			<sid value="1258"/>
+			<sid value="1260"/>
+			<sid value="1262"/>
+			<sid value="1264"/>
+			<sid value="1266"/>
+			<sid value="1268"/>
+			<sid value="1270"/>
 			<sid value="1271"/>
+			<sid value="1296"/>
+			<sid value="1298"/>
+			<sid value="1302"/>
+			<sid value="1311"/>
 			<sid value="1332"/>
+			<sid value="1334"/>
 			<sid value="1336"/>
 			<sid value="1338"/>
+			<sid value="1340"/>
+			<sid value="1342"/>
+			<sid value="1344"/>
+			<sid value="1346"/>
+			<sid value="1348"/>
+			<sid value="1370"/>
+			<sid value="1372"/>
 			<sid value="1375"/>
 			<sid value="1383"/>
 			<sid value="1385"/>
+			<sid value="1393"/>
 			<sid value="1400"/>
+			<sid value="1414"/>
+			<sid value="1422"/>
+			<sid value="1424"/>
+			<sid value="1426"/>
 			<sid value="1466"/>
 			<sid value="1493"/>
+			<sid value="1495"/>
 			<sid value="1499"/>
+			<sid value="1501"/>
+			<sid value="1526"/>
 			<sid value="1528"/>
 			<sid value="1530"/>
 			<sid value="1532"/>
@@ -5083,19 +7262,56 @@
 			<sid value="1542"/>
 			<sid value="1544"/>
 			<sid value="1546"/>
+			<sid value="1558"/>
+			<sid value="1560"/>
+			<sid value="1566"/>
+			<sid value="1568"/>
+			<sid value="1638"/>
 			<sid value="1640"/>
+			<sid value="1642"/>
 			<sid value="1650"/>
 			<sid value="1652"/>
-			<sid value="1750"/>
-			<sid value="1752"/>
-			<sid value="1812"/>
+			<sid value="1654"/>
+			<sid value="1688"/>
+			<sid value="1712"/>
+			<sid value="1720"/>
+			<sid value="1763"/>
+			<sid value="1765"/>
+			<sid value="1800"/>
+			<sid value="1816"/>
 			<sid value="1818"/>
-			<sid value="1872"/>
+			<sid value="1866"/>
+			<sid value="1874"/>
+			<sid value="1900"/>
+			<sid value="1913"/>
+			<sid value="1916"/>
+			<sid value="1928"/>
+			<sid value="1930"/>
+			<sid value="1934"/>
+			<sid value="1938"/>
+			<sid value="1972"/>
+			<sid value="1982"/>
+			<sid value="1984"/>
+			<sid value="1986"/>
 			<sid value="1989"/>
-			<sid value="2038"/>
+			<sid value="1992"/>
+			<sid value="2010"/>
+			<sid value="2012"/>
+			<sid value="2014"/>
+			<sid value="2018"/>
+			<sid value="2022"/>
+			<sid value="2026"/>
+			<sid value="2040"/>
+			<sid value="2044"/>
+			<sid value="2046"/>
+			<sid value="2064"/>
+			<sid value="2133"/>
+			<sid value="3020"/>
 			<sid value="3226"/>
-			<sid value="5667"/>
+			<sid value="3244"/>
+			<sid value="3292"/>
 			<sid value="30524"/>
+			<sid value="30635"/>
 		</cdma>
 	</provider>
 	<provider>
@@ -5112,12 +7328,67 @@
 	</provider>
 	<provider>
 		<name>MetroPCS</name>
-		<cdma />
+		<cdma>
+			<!-- Assignments taken from IFAST: http://www.ifast.org/files/NationalSID.htm -->
+			<sid value="4269"/>
+			<sid value="4273"/>
+			<sid value="4387"/>
+			<sid value="4531"/>
+			<sid value="4533"/>
+			<sid value="4547"/>
+			<sid value="4815"/>
+			<sid value="4855"/>
+			<sid value="5007"/>
+			<sid value="5023"/>
+			<sid value="5037"/>
+			<sid value="5097"/>
+			<sid value="5167"/>
+			<sid value="5199"/>
+			<sid value="21580"/>
+		</cdma>
 	</provider>
 	<provider>
 		<name>Virgin Mobile / Helio</name>
 		<cdma />
 	</provider>
+	<provider>
+		<name>Cellular South</name>
+		<cdma>
+			<!-- Assignments taken from IFAST: http://www.ifast.org/files/NationalSID.htm
+			     NOTE: Cellular South appears to use "Lukas, Nace, Gutierrez & Sachs, Chartered"
+			     as their license administrator, but that firm also administers Rural Cellular
+			     Corporation (recently bought by Verizon) as well, so SIDs counted for
+			     Cellular South were found by searching the FCC database for "Cellular South",
+			     looking up the returned Cellular Market Areas in the IFAST database, and from
+			     the IFAST database results using SIDs attributed to "Lukas, Nace, ..."
+			-->
+			<sid value="160"/>
+			<sid value="264"/>
+			<sid value="1382"/>
+			<sid value="1394"/>
+			<sid value="1996"/>
+		</cdma>
+	</provider>
+	<provider>
+		<name>BendBroadband</name>
+		<gsm>
+			<network-id mcc="311" mnc="570"/>
+			<apn value="ISP"/>
+		</gsm>
+	</provider>
+	<provider>
+		<name>MTPCS (Cellular One)</name>
+		<gsm>
+			<network-id mcc="310" mnc="570"/>
+			<apn value="wapgw.chinookwireless.net"/>
+		</gsm>
+	</provider>
+	<provider>
+		<name>Mid-Rivers Cellular</name>
+		<cdma>
+			<sid value="3102"/>
+		</cdma>
+	</provider>
 </country>
 
 <!-- Uruguay -->
@@ -5127,16 +7398,34 @@
 		<gsm>
 			<network-id mcc="748" mnc="00"/>
 			<network-id mcc="748" mnc="01"/>
+			<apn value="adslmovil">
+				<name>ADSL Móvil</name>
+				<dns>200.40.30.245</dns>
+				<dns>200.40.220.245</dns>
+			</apn>
+			<apn value="prepago.ancel">
+				<name>ADSL Móvil Prepago</name>
+				<username>BAM</username>
+				<password>BAM</password>
+			</apn>
 			<apn value="gprs.ancel">
+				<name>GPRS</name>
 				<dns>200.40.30.245</dns>
 				<dns>200.40.220.245</dns>
 			</apn>
 		</gsm>
 	</provider>
 	<provider>
-		<name>CTI</name>
+		<name>Claro</name>
 		<gsm>
+			<network-id mcc="748" mnc="10"/>
+			<apn value="gprs.claro.com.uy">
+				<name>3G Internet</name>
+				<username>ctigprs</username>
+				<password>ctigprs999</password>
+			</apn>
 			<apn value="internet.ctimovil.com.uy">
+				<name>2G Internet</name>
 				<username>ctiweb</username>
 				<password>ctiweb999</password>
 			</apn>
@@ -5146,7 +7435,13 @@
 		<name>Movistar</name>
 		<gsm>
 			<network-id mcc="748" mnc="07"/>
+			<apn value="apnumt.movistar.com.uy">
+				<name>3G Internet</name>
+				<username>movistar</username>
+				<password>movistar</password>
+			</apn>
 			<apn value="webapn.movistar.com.uy">
+				<name>2G Internet</name>
 				<username>movistar</username>
 				<password>movistar</password>
 			</apn>
@@ -5195,6 +7490,106 @@
 			</apn>
 		</gsm>
 	</provider>
+	<provider>
+		<name>Movilnet</name>
+		<gsm>
+			<network-id mcc="734" mnc="06"/>
+			<apn value="int.movilnet.com.ve">
+				<dns>200.44.32.12</dns>
+				<dns>200.11.248.12</dns>
+			</apn>
+		</gsm>
+	</provider>
+	<provider>
+		<name>Movistar</name>
+		<gsm>
+			<network-id mcc="734" mnc="04"/>
+			<apn value="internet.movistar.ve">
+				<dns>200.35.65.3</dns>
+				<dns>200.35.65.4</dns>
+			</apn>
+		</gsm>
+	</provider>
+</country>
+
+<!-- Viet Nam -->
+<country code="vn">
+	<provider>
+		<name>MobiFone</name>
+		<gsm>
+			<network-id mcc="452" mnc="01"/>
+			<apn value="m-wap">
+				<username>mms</username>
+				<password>mms</password>
+			</apn>
+		</gsm>
+	</provider>
+	<provider>
+		<name>Vinaphone</name>
+		<gsm>
+			<network-id mcc="452" mnc="02"/>
+			<apn value="m3-world">
+				<name>Mobile Internet</name>
+				<username>mms</username>
+				<password>mms</password>
+			</apn>
+			<apn value="m3-card">
+				<name>Mobile Broadband</name>
+				<username>mms</username>
+				<password>mms</password>
+			</apn>
+		</gsm>
+	</provider>
+	<provider>
+		<name>S-Fone</name>
+		<cdma>
+			<!-- phone number dialed appears to be 1501 not 777 (???
+			     http://www.sfone.com.vn/webportal/guideMobile02_vi.html?pageNum=3&subNum=9&idxNum=091
+			  -->
+			<username>S-Fone</username>
+			<!-- Assignments taken from IFAST: http://www.ifast.org/files/NationalSID.htm -->
+			<sid value="13331"/>
+		</cdma>
+	</provider>
+	<provider>
+		<name>Viettel Mobile</name>
+		<gsm>
+			<network-id mcc="452" mnc="04"/>
+			<apn value="v-internet">
+				<name>Mobile Internet</name>
+			</apn>
+			<apn value="e-connect">
+				<name>D-com 3G</name>
+			</apn>
+		</gsm>
+	</provider>
+	<provider>
+		<name>Vietnamobile</name>
+		<gsm>
+			<network-id mcc="452" mnc="05"/>
+			<apn value="internet"/>
+		</gsm>
+	</provider>
+	<provider>
+		<name>EVNTelecom/E-Mobile</name>
+		<gsm>
+			<network-id mcc="452" mnc="08"/>
+			<apn value="e-internet">
+				<name>EVNTelecomNet</name>
+			</apn>
+		</gsm>
+		<cdma>
+			<username>evntelecom</username>
+			<password>evntelecom</password>
+		</cdma>
+	</provider>
+	<provider>
+		<name>Beeline VN</name>
+		<gsm>
+			<network-id mcc="452" mnc="07"/>
+			<apn value="internet"/>
+		</gsm>
+	</provider>
 </country>
 
 <!-- South Africa -->
@@ -5204,7 +7599,6 @@
 		<gsm>
 			<network-id mcc="655" mnc="07"/>
 			<apn value="internet">
-				<username>Cellcis</username>
 				<dns>196.7.0.138</dns>
 				<dns>196.7.142.132</dns>
 			</apn>
@@ -5224,10 +7618,7 @@
 		<name>Vodacom</name>
 		<gsm>
 			<network-id mcc="655" mnc="01"/>
-			<apn value="internet">
-				<dns>196.207.40.165</dns>
-				<dns>196.43.46.190</dns>
-			</apn>
+			<apn value="internet"/>
 			<apn value="unrestricted">
 				<name>Unrestricted</name>
 				<dns>196.207.32.69</dns>
@@ -5238,12 +7629,20 @@
 	<provider>
 		<name>Virgin Mobile</name>
 		<gsm>
+			<network-id mcc="655" mnc="07"/>
 			<apn value="vdata">
 				<dns>196.7.0.138</dns>
 				<dns>196.7.142.132</dns>
 			</apn>
 		</gsm>
 	</provider>
+	<provider>
+		<name>8.ta</name>
+		<gsm>
+			<network-id mcc="655" mnc="02"/>
+			<apn value="internet"/>
+		</gsm>
+	</provider>
 </country>
 
 </serviceproviders>

++++++ mobile-broadband-provider-info.yaml
--- mobile-broadband-provider-info.yaml
+++ mobile-broadband-provider-info.yaml
@@ -1,6 +1,6 @@
 Name: mobile-broadband-provider-info
 Summary: Moblie Broadband Dataprovider Database
-Version: 20090918
+Version: 20110511
 Release: 1
 Group: Applications/Internet
 License: Creative Commons Public Domain



More information about the MeeGo-commits mailing list