diff --git a/import.log b/import.log
index 5ebc807..47131c5 100644
--- a/import.log
+++ b/import.log
@@ -1,2 +1,3 @@
 speech-dispatcher-0_6_6-13_fc7:HEAD:speech-dispatcher-0.6.6-13.fc7.src.rpm:1214288030
 speech-dispatcher-0_6_6-13_fc7:F-8:speech-dispatcher-0.6.6-13.fc7.src.rpm:1214550322
+speech-dispatcher-0_6_6-16_fc7:F-8:speech-dispatcher-0.6.6-16.fc7.src.rpm:1216181955
diff --git a/speech-dispatcher.spec b/speech-dispatcher.spec
index 733e563..dd56460 100644
--- a/speech-dispatcher.spec
+++ b/speech-dispatcher.spec
@@ -1,8 +1,16 @@
 %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")
 
+%if 0%{?olpc}
+ %define with_nas 0
+ %define with_pulse 0
+%else
+ %define with_nas 1
+ %define with_pulse 1
+%endif
+
 Name:           speech-dispatcher
 Version:        0.6.6
-Release:        13%{?dist}
+Release:        16%{?dist}
 Summary:        To provide a high-level device independent layer for speech synthesis
 Group:          System Environment/Libraries
 
@@ -21,12 +29,21 @@ BuildRequires: python-setuptools-devel
 %else
 BuildRequires: python-setuptools
 %endif
+
 BuildRequires:	flite-devel
-#BuildRequires:	ibmtts-devel
 BuildRequires:	espeak-devel
+
+%if %{with_nas}
 Buildrequires:	nas-devel
-BuildRequires:	alsa-lib-devel
+%endif
+
+%if %{with_pulse}
 Buildrequires:	pulseaudio-lib-devel
+%else
+Buildrequires: glib2-devel
+%endif
+
+BuildRequires:	alsa-lib-devel
 BuildRequires:  dotconf-devel
 BuildRequires:	texinfo
 Requires(post): /sbin/chkconfig /sbin/install-info
@@ -79,16 +96,29 @@ Requires: 	speech-dispatcher = %{version}-%{release}
 speechd python module
 
 %prep
+
+cat << EOF
+Build options:
+nas support   :                             %{with_nas}
+pulse support :                             %{with_pulse}
+
+Dist Status:
+olpc          :			            %{?olpc}
+fedora        :				    %{?fedora}
+EOF
+
+
 %setup -q
 %patch -p1
 
+
 %build
 iconv -f ISO-8859-2 -t UTF-8 doc/speech-dispatcher-cs.texi -o doc/speech-dispatcher-cs_c.texi
 mv doc/speech-dispatcher-cs_c.texi doc/speech-dispatcher-cs.texi
+
 %configure --disable-static
 make %{?_smp_mflags}
 
-
 %install
 rm -rf $RPM_BUILD_ROOT
 
@@ -216,6 +246,19 @@ fi
 
 %changelog
 
+* Wed Jul 16 2008    Hemant Goyal <goyal.hemant@gmail.com> 0.6.6-16
+
+- yet another release bump required :-/
+
+* Wed Jul 16 2008    Hemant Goyal <goyal.hemant@gmail.com> 0.6.6-15
+
+- release bump
+
+* Mon Jul 13 2008    Hemant Goyal <goyal.hemant@gmail.com> 0.6.6-14
+
+- conditional build required for OLPC Branch - Building without nas and 
+  pulse-audio support.
+
 * Mon Jun 23 2008    Hemant Goyal <goyal.hemant@gmail.com> 0.6.6-13
 
 - changed permission of speech-dispatcherd to 0644 too.