diff --git a/import.log b/import.log
index b7a6726..e40f075 100644
--- a/import.log
+++ b/import.log
@@ -1 +1,2 @@
 speech-dispatcher-0_6_6-13_fc7:OLPC-2:speech-dispatcher-0.6.6-13.fc7.src.rpm:1214288283
+speech-dispatcher-0_6_6-14_fc7:OLPC-2:speech-dispatcher-0.6.6-14.fc7.src.rpm:1215969412
diff --git a/speech-dispatcher.spec b/speech-dispatcher.spec
index 733e563..569474b 100644
--- a/speech-dispatcher.spec
+++ b/speech-dispatcher.spec
@@ -2,7 +2,7 @@
 
 Name:           speech-dispatcher
 Version:        0.6.6
-Release:        13%{?dist}
+Release:        14%{?dist}
 Summary:        To provide a high-level device independent layer for speech synthesis
 Group:          System Environment/Libraries
 
@@ -21,12 +21,16 @@ BuildRequires: python-setuptools-devel
 %else
 BuildRequires: python-setuptools
 %endif
+
 BuildRequires:	flite-devel
-#BuildRequires:	ibmtts-devel
 BuildRequires:	espeak-devel
+
+%if 1%{?olpc} >= 2
 Buildrequires:	nas-devel
-BuildRequires:	alsa-lib-devel
 Buildrequires:	pulseaudio-lib-devel
+%endif
+
+BuildRequires:	alsa-lib-devel
 BuildRequires:  dotconf-devel
 BuildRequires:	texinfo
 Requires(post): /sbin/chkconfig /sbin/install-info
@@ -85,8 +89,14 @@ speechd python module
 %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
+
+%if 1%{?olpc} >= 2
+%configure --disable-static --without-nas --without-pulse
+make %{?_smp_mflags}
+%else
 %configure --disable-static
 make %{?_smp_mflags}
+%endif
 
 
 %install
@@ -216,6 +226,11 @@ fi
 
 %changelog
 
+* 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.